Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Wed Jul 13 14:55:47 2022 +0200
@@ -17,11 +17,11 @@
     """
     Class implementing a dialog to enter the data for a rebase session.
     """
-    def __init__(self, tagsList, branchesList, bookmarksList, version,
-                 parent=None):
+
+    def __init__(self, tagsList, branchesList, bookmarksList, version, parent=None):
         """
         Constructor
-        
+
         @param tagsList list of tags
         @type list of str
         @param branchesList list of branches
@@ -35,21 +35,21 @@
         """
         super().__init__(parent)
         self.setupUi(self)
-        
+
         self.__sourceRevisionButtonGroup = QButtonGroup(self)
         self.__sourceRevisionButtonGroup.addButton(self.parentButton)
         self.__sourceRevisionButtonGroup.addButton(self.sourceButton)
         self.__sourceRevisionButtonGroup.addButton(self.baseButton)
-        
+
         self.tag1Combo.addItems(sorted(tagsList))
         self.tag2Combo.addItems(sorted(tagsList))
         self.branch1Combo.addItems(["default"] + sorted(branchesList))
         self.branch2Combo.addItems(["default"] + sorted(branchesList))
         self.bookmark1Combo.addItems(sorted(bookmarksList))
         self.bookmark2Combo.addItems(sorted(bookmarksList))
-        
+
         self.dryRunGroup.setEnabled(version >= (4, 7, 0))
-        
+
         # connect various radio buttons and input fields
         self.id1Button.toggled.connect(self.__updateOK)
         self.tag1Button.toggled.connect(self.__updateOK)
@@ -61,22 +61,22 @@
         self.branch2Button.toggled.connect(self.__updateOK)
         self.bookmark2Button.toggled.connect(self.__updateOK)
         self.expression2Button.toggled.connect(self.__updateOK)
-        
+
         self.id1Edit.textChanged.connect(self.__updateOK)
         self.expression1Edit.textChanged.connect(self.__updateOK)
         self.id2Edit.textChanged.connect(self.__updateOK)
         self.expression2Edit.textChanged.connect(self.__updateOK)
-        
+
         self.tag1Combo.editTextChanged.connect(self.__updateOK)
         self.branch1Combo.editTextChanged.connect(self.__updateOK)
         self.bookmark1Combo.editTextChanged.connect(self.__updateOK)
         self.tag2Combo.editTextChanged.connect(self.__updateOK)
         self.branch2Combo.editTextChanged.connect(self.__updateOK)
         self.bookmark2Combo.editTextChanged.connect(self.__updateOK)
-        
+
         msh = self.minimumSizeHint()
         self.resize(max(self.width(), msh.width()), msh.height())
-    
+
     @pyqtSlot()
     def __updateOK(self):
         """
@@ -94,7 +94,7 @@
                 enabled = enabled and bool(self.bookmark1Combo.currentText())
             elif self.expression1Button.isChecked():
                 enabled = enabled and bool(self.expression1Edit.text())
-        
+
         if self.id2Button.isChecked():
             enabled = enabled and bool(self.id2Edit.text())
         elif self.tag2Button.isChecked():
@@ -105,14 +105,13 @@
             enabled = enabled and bool(self.bookmark2Combo.currentText())
         elif self.expression2Button.isChecked():
             enabled = enabled and bool(self.expression2Edit.text())
-        
-        self.buttonBox.button(
-            QDialogButtonBox.StandardButton.Ok).setEnabled(enabled)
-    
+
+        self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(enabled)
+
     def __getRevision(self, no):
         """
         Private method to generate the revision.
-        
+
         @param no revision number to generate (1 or 2)
         @type int
         @return revision
@@ -146,7 +145,7 @@
             expressionButton = self.expression2Button
             expressionEdit = self.expression2Edit
             tipButton = self.tip2Button
-        
+
         if numberButton.isChecked():
             return "rev({0})".format(numberSpinBox.value())
         elif idButton.isChecked():
@@ -161,13 +160,13 @@
             return expressionEdit.text()
         elif tipButton and tipButton.isChecked():
             return ""
-        
+
         return ""
-    
+
     def getData(self):
         """
         Public method to retrieve the data for the rebase session.
-        
+
         @return tuple with a source indicator of "S" or "B", the source
             revision, the destination revision, a flag indicating to collapse,
             a flag indicating to keep the original changesets, a flag
@@ -184,7 +183,7 @@
         else:
             indicator = ""
         rev1 = self.__getRevision(1) if indicator else ""
-        
+
         return (
             indicator,
             rev1,