eric7.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog
Module implementing a dialog to enter the data for a merge operation.
Global Attributes
Classes
HgMergeDialog |
Class implementing a dialog to enter the data for a merge operation. |
Functions
HgMergeDialog
Class implementing a dialog to enter the data for a merge operation.
Derived from
QDialog, Ui_HgMergeDialog
Class Attributes
Class Methods
Methods
Static Methods
HgMergeDialog (Constructor)
HgMergeDialog(tagsList, branchesList, bookmarksList=None, parent=None)
Constructor
- tagsList (list of str)
-
list of tags
- branchesList (list of str)
-
list of branches
- bookmarksList (list of str)
-
list of bookmarks
- parent (QWidget)
-
parent widget
HgMergeDialog.__updateOK
__updateOK()
Private slot to update the OK button.
HgMergeDialog.getParameters
getParameters()
Public method to retrieve the merge data.
- Return:
-
tuple naming the revision and a flag indicating a
forced merge
- Return Type:
-
tuple of (str, bool)