--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -19,11 +19,11 @@ """ Class implementing a dialog to enter the data for a backout operation. """ - def __init__(self, tagsList, branchesList, bookmarksList=None, - parent=None): + + def __init__(self, tagsList, branchesList, bookmarksList=None, parent=None): """ Constructor - + @param tagsList list of tags @type list of str @param branchesList list of branches @@ -35,16 +35,14 @@ """ super().__init__(parent) self.setupUi(self) - - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(False) - + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False) + project = ericApp().getObject("Project") pwl, pel = project.getProjectDictionaries() language = project.getProjectSpellLanguage() - self.messageEdit.setLanguageWithPWL( - language, pwl or None, pel or None) - + self.messageEdit.setLanguageWithPWL(language, pwl or None, pel or None) + self.tagCombo.addItems(sorted(tagsList)) self.branchCombo.addItems(["default"] + sorted(branchesList)) if bookmarksList is not None: @@ -52,7 +50,7 @@ else: self.bookmarkButton.setHidden(True) self.bookmarkCombo.setHidden(True) - + # connect various radio buttons and input fields self.idButton.toggled.connect(self.__updateOK) self.tagButton.toggled.connect(self.__updateOK) @@ -60,17 +58,17 @@ self.bookmarkButton.toggled.connect(self.__updateOK) self.expressionButton.toggled.connect(self.__updateOK) self.noneButton.toggled.connect(self.__updateOK) - + self.idEdit.textChanged.connect(self.__updateOK) self.expressionEdit.textChanged.connect(self.__updateOK) - + self.tagCombo.editTextChanged.connect(self.__updateOK) self.branchCombo.editTextChanged.connect(self.__updateOK) self.bookmarkCombo.editTextChanged.connect(self.__updateOK) - + self.__initDateTime = QDateTime.currentDateTime() self.dateEdit.setDateTime(self.__initDateTime) - + @pyqtSlot() def __updateOK(self): """ @@ -89,14 +87,13 @@ enabled = bool(self.bookmarkCombo.currentText()) elif self.expressionButton.isChecked(): enabled = enabled and bool(self.expressionEdit.text()) - - self.buttonBox.button( - QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) - + + self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enabled) + def getParameters(self): """ Public method to retrieve the backout data. - + @return tuple naming the revision, a flag indicating a merge, the commit date, the commit user and a commit message @rtype tuple of (str, bool, str, str, str) @@ -115,22 +112,17 @@ rev = self.expressionEdit.text() else: rev = "" - + date = ( self.dateEdit.dateTime().toString("yyyy-MM-dd hh:mm") - if self.dateEdit.dateTime() != self.__initDateTime else - "" + if self.dateEdit.dateTime() != self.__initDateTime + else "" ) - + msg = ( self.messageEdit.toPlainText() - if self.messageEdit.toPlainText() else - self.tr("Backed out changeset <{0}>.").format(rev) + if self.messageEdit.toPlainText() + else self.tr("Backed out changeset <{0}>.").format(rev) ) - - return (rev, - self.mergeCheckBox.isChecked, - date, - self.userEdit.text(), - msg - ) + + return (rev, self.mergeCheckBox.isChecked, date, self.userEdit.text(), msg)