eric5.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
Methods
HgMergeDialog (Constructor)
HgMergeDialog(force, tagsList, branchesList, parent = None)
Constructor
- force
-
flag indicating a forced merge (boolean)
- tagsList
-
list of tags (list of strings)
- branchesList
-
list of branches (list of strings)
- parent
-
parent widget (QWidget)
HgMergeDialog.getParameters
getParameters()
Public method to retrieve the merge data.
- Returns:
-
tuple naming the revision and a flag indicating a
forced merge (string, boolean)