Mercurial Repositories > eric / file diff

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py	Thu Jul 07 11:23:56 2022 +0200
@@ -0,0 +1,108 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2010 - 2022 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a dialog to enter the data for a merge operation.
+"""
+
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox
+
+from .Ui_HgMergeDialog import Ui_HgMergeDialog
+
+
+class HgMergeDialog(QDialog, Ui_HgMergeDialog):
+    """
+    Class implementing a dialog to enter the data for a merge operation.
+    """
+    def __init__(self, tagsList, branchesList, bookmarksList=None,
+                 parent=None):
+        """
+        Constructor
+        
+        @param tagsList list of tags
+        @type list of str
+        @param branchesList list of branches
+        @type list of str
+        @param bookmarksList list of bookmarks
+        @type list of str
+        @param parent parent widget
+        @type QWidget
+        """
+        super().__init__(parent)
+        self.setupUi(self)
+       
+        self.buttonBox.button(
+            QDialogButtonBox.StandardButton.Ok).setEnabled(False)
+        
+        self.tagCombo.addItems(sorted(tagsList))
+        self.branchCombo.addItems(["default"] + sorted(branchesList))
+        if bookmarksList is not None:
+            self.bookmarkCombo.addItems(sorted(bookmarksList))
+        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):
+        """
+        Private slot to update the OK button.
+        """
+        enabled = True
+        if self.idButton.isChecked():
+            enabled = self.idEdit.text() != ""
+        elif self.tagButton.isChecked():
+            enabled = self.tagCombo.currentText() != ""
+        elif self.branchButton.isChecked():
+            enabled = self.branchCombo.currentText() != ""
+        elif self.bookmarkButton.isChecked():
+            enabled = self.bookmarkCombo.currentText() != ""
+        elif self.expressionButton.isChecked():
+            enabled = enabled and bool(self.expressionEdit.text())
+        
+        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)
+        """
+        if self.numberButton.isChecked():
+            rev = "rev({0})".format(self.numberSpinBox.value())
+        elif self.idButton.isChecked():
+            rev = "id({0})".format(self.idEdit.text())
+        elif self.tagButton.isChecked():
+            rev = self.tagCombo.currentText()
+        elif self.branchButton.isChecked():
+            rev = self.branchCombo.currentText()
+        elif self.bookmarkButton.isChecked():
+            rev = self.bookmarkCombo.currentText()
+        elif self.expressionButton.isChecked():
+            rev = self.expressionEdit.text()
+        else:
+            rev = ""
+        
+        return rev, self.forceCheckBox.isChecked()