# eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog

Module implementing a dialog to enter the merge data.

### Global Attributes

None

### Classes

GitMergeDialog | Class implementing a dialog to enter the merge data.

### Functions

None

## GitMergeDialog

Class implementing a dialog to enter the merge data.

### Derived from

QDialog, Ui_GitMergeDialog

### Class Attributes

None

### Class Methods

None

### Methods

GitMergeDialog | Constructor
__generateDefaultCommitMessage | Private slot to generate a default commit message based on the data entered.
__updateOK | Private slot to update the OK button.
getParameters | Public method to retrieve the merge data.
on_branchButton_toggled | Private slot to handle changes of the Branch select button.
on_branchCombo_editTextChanged | Private slot to handle changes of the Branch combo.
on_commitGroupBox_toggled | Private slot to handle changes of the Commit select group.
on_commitMessageEdit_textChanged | Private slot to handle changes of the commit message edit.
on_idButton_toggled | Private slot to handle changes of the ID select button.
on_idEdit_textChanged | Private slot to handle changes of the Commit edit.
on_noneButton_toggled | Private slot to handle changes of the None select button.
on_remoteBranchButton_toggled | Private slot to handle changes of the Remote Branch select button.
on_remoteBranchCombo_editTextChanged | Private slot to handle changes of the Remote Branch combo.
on_tagButton_toggled | Private slot to handle changes of the Tag select button.
on_tagCombo_editTextChanged | Private slot to handle changes of the Tag combo.

### Static Methods

None

#### GitMergeDialog (Constructor)

GitMergeDialog(tagsList, branchesList, currentBranch, remoteBranchesList, parent=None)

Constructor

tagsList (list of str)
  list of tags
branchesList (list of str)
  list of branches
currentBranch (str)
  name of the current branch
remoteBranchesList (list of str)
  list of remote branches
parent (QWidget)
  reference to the parent widget

#### GitMergeDialog.__generateDefaultCommitMessage

__generateDefaultCommitMessage()

Private slot to generate a default commit message based on the data entered.

#### GitMergeDialog.__updateOK

__updateOK()

Private slot to update the OK button.

#### GitMergeDialog.getParameters

getParameters()

Public method to retrieve the merge data.

Return:
  tuple naming the revision, a flag indicating that the merge shall be committed, the commit message, a flag indicating that a log summary shall be appended and a flag indicating to show diff statistics at the end of the merge

Return Type:
  tuple of (str, bool, str, bool, bool)

#### GitMergeDialog.on_branchButton_toggled

on_branchButton_toggled(_checked)

Private slot to handle changes of the Branch select button.

_checked (bool)
  state of the button (unused)

#### GitMergeDialog.on_branchCombo_editTextChanged

on_branchCombo_editTextChanged(_txt)

Private slot to handle changes of the Branch combo.

_txt (str)
  text of the combo (unused)

#### GitMergeDialog.on_commitGroupBox_toggled

on_commitGroupBox_toggled(_checked)

Private slot to handle changes of the Commit select group.

_checked (bool)
  state of the group (unused)

#### GitMergeDialog.on_commitMessageEdit_textChanged

on_commitMessageEdit_textChanged()

Private slot to handle changes of the commit message edit.

#### GitMergeDialog.on_idButton_toggled

on_idButton_toggled(_checked)

Private slot to handle changes of the ID select button.

_checked (bool)
  state of the button (unused)

#### GitMergeDialog.on_idEdit_textChanged

on_idEdit_textChanged(_txt)

Private slot to handle changes of the Commit edit.

_txt (str)
  text of the edit (unused)

#### GitMergeDialog.on_noneButton_toggled

on_noneButton_toggled(_checked)

Private slot to handle changes of the None select button.

_checked (bool)
  state of the button (unused)

#### GitMergeDialog.on_remoteBranchButton_toggled

on_remoteBranchButton_toggled(_checked)

Private slot to handle changes of the Remote Branch select button.

_checked (bool)
  state of the button (unused)

#### GitMergeDialog.on_remoteBranchCombo_editTextChanged

on_remoteBranchCombo_editTextChanged(_txt)

Private slot to handle changes of the Remote Branch combo.

_txt (str)
  text of the combo (unused)

#### GitMergeDialog.on_tagButton_toggled

on_tagButton_toggled(_checked)

Private slot to handle changes of the Tag select button.

_checked (bool)
  state of the button (unused)

#### GitMergeDialog.on_tagCombo_editTextChanged

on_tagCombo_editTextChanged(_txt)

Private slot to handle changes of the Tag combo.

_txt (str)
  text of the combo (unused)

Up