diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.py Wed Jul 13 14:55:47 2022 +0200
@@ -17,11 +17,11 @@
"""
Class implementing a dialog to enter the revisions for the hg diff command.
"""
- 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.tag1Combo.addItems(sorted(tagsList))
self.tag2Combo.addItems(sorted(tagsList))
self.branch1Combo.addItems(["default"] + sorted(branchesList))
@@ -49,7 +48,7 @@
self.bookmark1Combo.setHidden(True)
self.bookmark2Button.setHidden(True)
self.bookmark2Combo.setHidden(True)
-
+
# connect various radio buttons and input fields
self.id1Button.toggled.connect(self.__updateOK)
self.id2Button.toggled.connect(self.__updateOK)
@@ -61,22 +60,22 @@
self.bookmark2Button.toggled.connect(self.__updateOK)
self.expression1Button.toggled.connect(self.__updateOK)
self.expression2Button.toggled.connect(self.__updateOK)
-
+
self.id1Edit.textChanged.connect(self.__updateOK)
self.id2Edit.textChanged.connect(self.__updateOK)
self.expression1Edit.textChanged.connect(self.__updateOK)
self.expression2Edit.textChanged.connect(self.__updateOK)
-
+
self.tag1Combo.editTextChanged.connect(self.__updateOK)
self.tag2Combo.editTextChanged.connect(self.__updateOK)
self.branch1Combo.editTextChanged.connect(self.__updateOK)
self.branch2Combo.editTextChanged.connect(self.__updateOK)
self.bookmark1Combo.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):
"""
@@ -93,7 +92,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():
@@ -104,14 +103,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
@@ -149,7 +147,7 @@
tipButton = self.tip2Button
prevButton = self.prev2Button
noneButton = self.none2Button
-
+
if numberButton.isChecked():
return "rev({0})".format(numberSpinBox.value())
elif idButton.isChecked():
@@ -168,17 +166,17 @@
return "."
elif noneButton.isChecked():
return ""
-
+
return ""
-
+
def getRevisions(self):
"""
Public method to get the revisions.
-
+
@return list of two revisions
@rtype list of [str, str]
"""
rev1 = self.__getRevision(1)
rev2 = self.__getRevision(2)
-
+
return [rev1, rev2]
