eric: comparison eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

-:8a7677a63c8d
+:68ec9c3d4de5
 from PyQt6.QtWidgets import (
 QWidget, QDialogButtonBox, QHeaderView, QTreeWidgetItem, QApplication,
 QLineEdit, QMenu, QInputDialog
 )
-from E5Gui.E5Application import e5App
+from E5Gui.EricApplication import ericApp
-from E5Gui import E5MessageBox, E5FileDialog
+from E5Gui import EricMessageBox, EricFileDialog
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui.EricOverrideCursor import EricOverrideCursor
 from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog
 from .HgDiffHighlighter import HgDiffHighlighter
 from .HgDiffGenerator import HgDiffGenerator
 self.__logTreeNormalFont = self.logTree.font()
 self.__logTreeNormalFont.setBold(False)
 self.__logTreeBoldFont = self.logTree.font()
 self.__logTreeBoldFont.setBold(True)
-self.__logTreeHasDarkBackground = e5App().usesDarkPalette()
+self.__logTreeHasDarkBackground = ericApp().usesDarkPalette()
 self.detailsEdit.anchorClicked.connect(self.__revisionClicked)
 self.__initActionsMenu()
 args.append("-nb")
 output, errMsg = self.__hgClient.runcommand(args)
 if errMsg:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr("Mercurial Error"),
 errMsg)
 if output:
 args.append("--closed")
 output, errMsg = self.__hgClient.runcommand(args)
 if errMsg:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr("Mercurial Error"),
 errMsg)
 if output:
 args.append("{rev}\n")
 output, errMsg = self.__hgClient.runcommand(args)
 if errMsg:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr("Mercurial Error"),
 errMsg)
 if output:
 args = self.vcs.initCommand("tags")
 output, errMsg = self.__hgClient.runcommand(args)
 if errMsg:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self,
 self.tr("Mercurial Error"),
 errMsg)
 res = ("", "")
 QDialogButtonBox.StandardButton.Cancel).setEnabled(True)
 self.buttonBox.button(
 QDialogButtonBox.StandardButton.Cancel).setDefault(True)
 QApplication.processEvents()
-with E5OverrideCursor():
+with EricOverrideCursor():
 self.buf = []
 self.cancelled = False
 self.errors.clear()
 self.intercept = False
 "logBrowserBookmarkPhase.tmpl"))
 if self.commandMode == "incoming":
 if self.__bundle:
 args.append(self.__bundle)
 elif not self.vcs.hasSubrepositories():
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 self.vcs.bundleFile = os.path.join(
 project.getProjectManagementDir(), "hg-bundle.hg")
 if os.path.exists(self.vcs.bundleFile):
 os.remove(self.vcs.bundleFile)
 preargs = args[:]
 itm.text(self.RevisionColumn).strip().split(":", 1)[0])
 if revs:
 shouldReopen = self.vcs.hgGraft(revs)
 if shouldReopen:
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 None,
 self.tr("Copy Changesets"),
 self.tr(
 """The project should be reread. Do this now?"""),
 yesDefault=True)
 if res:
-e5App().getObject("Project").reopenProject()
+ericApp().getObject("Project").reopenProject()
 return
 self.on_refreshButton_clicked()
 @pyqtSlot()
 if bookmark:
 rev = bookmark
 if rev:
 shouldReopen = self.vcs.vcsUpdate(revision=rev)
 if shouldReopen:
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 None,
 self.tr("Switch"),
 self.tr(
 """The project should be reread. Do this now?"""),
 yesDefault=True)
 if res:
-e5App().getObject("Project").reopenProject()
+ericApp().getObject("Project").reopenProject()
 return
 self.on_refreshButton_clicked()
 @pyqtSlot()
 refresh = True
 if self.initialCommandMode == "incoming":
 addNext = True
 if shouldReopen:
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 None,
 self.tr("Pull Changes"),
 self.tr(
 """The project should be reread. Do this now?"""),
 yesDefault=True)
 if res:
-e5App().getObject("Project").reopenProject()
+ericApp().getObject("Project").reopenProject()
 return
 if refresh:
 self.on_refreshButton_clicked(addNext=addNext)
 if not itm.data(0, self.__incomingRole):
 rev = itm.text(self.RevisionColumn).strip().split(":", 1)[1]
 shouldReopen = self.vcs.getExtensionObject("strip").hgStrip(
 rev=rev)
 if shouldReopen:
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 None,
 self.tr("Strip Changesets"),
 self.tr(
 """The project should be reread. Do this now?"""),
 yesDefault=True)
 if res:
-e5App().getObject("Project").reopenProject()
+ericApp().getObject("Project").reopenProject()
 return
 self.on_refreshButton_clicked()
 @pyqtSlot()
 Private slot to apply the currently previewed bundle file.
 """
 if self.initialCommandMode == "incoming" and bool(self.__bundle):
 shouldReopen = self.vcs.hgUnbundle(files=[self.__bundle])
 if shouldReopen:
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 None,
 self.tr("Apply Changegroup"),
 self.tr("""The project should be reread. Do this now?"""),
 yesDefault=True)
 if res:
-e5App().getObject("Project").reopenProject()
+ericApp().getObject("Project").reopenProject()
 return
 self.vcs.vcsLogBrowser()
 self.close()
 txt = topItem.text(fieldIndex)
 if searchRx.search(txt) is not None:
 self.logTree.setCurrentItem(self.logTree.topLevelItem(index))
 break
 else:
-E5MessageBox.information(
+EricMessageBox.information(
 self,
 self.tr("Find Commit"),
 self.tr("""'{0}' was not found.""").format(self.rxEdit.text()))
 def __revisionClicked(self, url):
 if fname != '.':
 fname = "{0}.diff".format(self.__filename)
 else:
 fname = dname
-fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
 self,
 self.tr("Save Diff"),
 fname,
 self.tr("Patch Files (*.diff)"),
 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,
 self.tr("Save Diff"),
 self.tr("<p>The patch 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)
-eol = e5App().getObject("Project").getEolString()
+eol = ericApp().getObject("Project").getEolString()
 try:
 with open(fname, "w", encoding="utf-8", newline="") as f:
 f.write(eol.join(self.diffEdit.toPlainText().splitlines()))
 except OSError as why:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self, self.tr('Save Diff'),
 self.tr(
 '<p>The patch file <b>{0}</b> could not be saved.'
 '<br>Reason: {1}</p>')
 .format(fname, str(why)))

Mercurial Repositories > eric / file comparison

comparison: eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py

eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py