--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/HgStripDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -17,11 +17,11 @@ """ Class implementing a dialog to enter the data to strip changesets. """ - 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,35 +35,35 @@ """ super().__init__(parent) self.setupUi(self) - + self.tagCombo.addItems(sorted(tagsList)) self.branchCombo.addItems(["default"] + sorted(branchesList)) if bookmarksList is not None: self.bookmarkCombo.addItems([""] + sorted(bookmarksList)) self.idEdit.setText(rev) - + # connect various radio buttons and input fields self.numberButton.toggled.connect(self.__updateOK) self.idButton.toggled.connect(self.__updateOK) self.tagButton.toggled.connect(self.__updateOK) self.branchButton.toggled.connect(self.__updateOK) self.expressionButton.toggled.connect(self.__updateOK) - + self.numberSpinBox.valueChanged.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) - + msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) - + self.__updateOK() - + self.idEdit.setFocus() - + @pyqtSlot() def __updateOK(self): """ @@ -80,14 +80,13 @@ enabled = enabled and bool(self.branchCombo.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 """ @@ -104,11 +103,11 @@ else: # should not happen return "" - + def getData(self): """ Public method to retrieve the data for the strip action. - + @return tuple with the revision, a bookmark name, a flag indicating to enforce the strip action, a flag indicating to omit the creation of backup bundles and a flag indicating to not modify the working