Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Wed Jul 13 14:55:47 2022 +0200
@@ -17,11 +17,11 @@
     """
     Class implementing a dialog to enter the data for a merge 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
@@ -33,10 +33,9 @@
         """
         super().__init__(parent)
         self.setupUi(self)
-       
-        self.buttonBox.button(
-            QDialogButtonBox.StandardButton.Ok).setEnabled(False)
-        
+
+        self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False)
+
         self.tagCombo.addItems(sorted(tagsList))
         self.branchCombo.addItems(["default"] + sorted(branchesList))
         if bookmarksList is not None:
@@ -44,24 +43,24 @@
         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)
         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)
-        
+
         msh = self.minimumSizeHint()
         self.resize(max(self.width(), msh.width()), msh.height())
-    
+
     @pyqtSlot()
     def __updateOK(self):
         """
@@ -78,14 +77,13 @@
             enabled = 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 merge data.
-        
+
         @return tuple naming the revision and a flag indicating a
             forced merge
         @rtype tuple of (str, bool)
@@ -104,5 +102,5 @@
             rev = self.expressionEdit.text()
         else:
             rev = ""
-        
+
         return rev, self.forceCheckBox.isChecked()