--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -17,11 +17,11 @@ """ Class implementing a dialog to enter the histedit parameters. """ - def __init__(self, tagsList, branchesList, bookmarksList=None, rev="", - parent=None): + + def __init__(self, tagsList, branchesList, bookmarksList=None, rev="", parent=None): """ Constructor - + @param tagsList list of tags @type list of str @param branchesList list of branches @@ -35,17 +35,17 @@ """ super().__init__(parent) self.setupUi(self) - + self.__sourceRevisionButtonGroup = QButtonGroup(self) self.__sourceRevisionButtonGroup.addButton(self.defaultButton) self.__sourceRevisionButtonGroup.addButton(self.outgoingButton) self.__sourceRevisionButtonGroup.addButton(self.revisionButton) - + self.tagCombo.addItems(sorted(tagsList)) self.branchCombo.addItems(["default"] + sorted(branchesList)) if bookmarksList is not None: self.bookmarkCombo.addItems(sorted(bookmarksList)) - + # connect various radio buttons and input fields self.defaultButton.toggled.connect(self.__updateOK) self.outgoingButton.toggled.connect(self.__updateOK) @@ -55,34 +55,34 @@ self.branchButton.toggled.connect(self.__updateOK) self.bookmarkButton.toggled.connect(self.__updateOK) self.expressionButton.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.numberSpinBox.valueChanged.connect(self.__updateOK) - + self.idEdit.setText(rev) if rev: self.revisionButton.setChecked(True) else: self.defaultButton.setChecked(True) - + msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) - + self.__updateOK() - + @pyqtSlot() def __updateOK(self): """ Private slot to update the OK button. """ enabled = True - + if self.revisionButton.isChecked(): if self.idButton.isChecked(): enabled = enabled and bool(self.idEdit.text()) @@ -94,14 +94,13 @@ enabled = enabled and 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 __getRevision(self): """ Private method to generate the revision. - + @return revision @rtype str """ @@ -122,13 +121,13 @@ return self.bookmarkCombo.currentText() elif self.expressionButton.isChecked(): return self.expressionEdit.text() - + return "" - + def getData(self): """ Public method to retrieve the data for the strip action. - + @return tuple with the revision, a flag indicating to to outgoing and a flag indicating to keep old nodes @rtype tuple (str, bool, bool)