private void OkClick(object sender, EventArgs e) { var process = new FormProcess(GitCommandHelpers.MergeBranchCmd(Branches.GetSelectedText(), fastForward.Checked, squash.Checked, noCommit.Checked, _NO_TRANSLATE_mergeStrategy.Text)); process.ShowDialog(this); var wasConflict = MergeConflictHandler.HandleMergeConflicts(this); if (!process.ErrorOccurred() || wasConflict) { Close(); } }
private void OkClick(object sender, EventArgs e) { Module.EffectiveSettings.NoFastForwardMerge = noFastForward.Checked; AppSettings.DontCommitMerge = noCommit.Checked; ScriptManager.RunEventScripts(this, ScriptEvent.BeforeMerge); string mergeMessagePath = null; if (addMergeMessage.Checked) { // [!] Do not reset the last commit message stored in AppSettings.LastCommitMessage _commitMessageManager.WriteCommitMessageToFile(mergeMessage.Text, CommitMessageType.Merge, usingCommitTemplate: false, ensureCommitMessageSecondLineEmpty: false); mergeMessagePath = _commitMessageManager.MergeMessagePath; } var command = GitCommandHelpers.MergeBranchCmd(Branches.GetSelectedText(), fastForward.Checked, squash.Checked, noCommit.Checked, _NO_TRANSLATE_mergeStrategy.Text, allowUnrelatedHistories.Checked, mergeMessagePath, addLogMessages.Checked ? (int)nbMessages.Value : (int?)null); bool success = FormProcess.ShowDialog(this, process: null, arguments: command, Module.WorkingDir, input: null, useDialogSettings: true); var wasConflict = MergeConflictHandler.HandleMergeConflicts(UICommands, this, !noCommit.Checked); if (success || wasConflict) { ScriptManager.RunEventScripts(this, ScriptEvent.AfterMerge); UICommands.RepoChangedNotifier.Notify(); Close(); } }
private void OkClick(object sender, EventArgs e) { Module.EffectiveSettings.NoFastForwardMerge = noFastForward.Checked; AppSettings.DontCommitMerge = noCommit.Checked; var successfullyMerged = FormProcess.ShowDialog(this, GitCommandHelpers.MergeBranchCmd(Branches.GetSelectedText(), fastForward.Checked, squash.Checked, noCommit.Checked, _NO_TRANSLATE_mergeStrategy.Text)); var wasConflict = MergeConflictHandler.HandleMergeConflicts(UICommands, this, !noCommit.Checked); if (successfullyMerged || wasConflict) { UICommands.RepoChangedNotifier.Notify(); Close(); } }
private void OkClick(object sender, EventArgs e) { Module.EffectiveSettings.NoFastForwardMerge = noFastForward.Checked; AppSettings.DontCommitMerge = noCommit.Checked; ScriptManager.RunEventScripts(this, ScriptEvent.BeforeMerge); var successfullyMerged = FormProcess.ShowDialog(this, GitCommandHelpers.MergeBranchCmd(Branches.GetSelectedText(), fastForward.Checked, squash.Checked, noCommit.Checked, _NO_TRANSLATE_mergeStrategy.Text, allowUnrelatedHistories.Checked, addMergeMessage.Checked ? mergeMessage.Text : null, addLogMessages.Checked ? (int)nbMessages.Value : (int?)null)); var wasConflict = MergeConflictHandler.HandleMergeConflicts(UICommands, this, !noCommit.Checked); if (successfullyMerged || wasConflict) { ScriptManager.RunEventScripts(this, ScriptEvent.AfterMerge); UICommands.RepoChangedNotifier.Notify(); Close(); } }
private void OkClick(object sender, EventArgs e) { Settings.NoFastForwardMerge = noFastForward.Checked; var successfullyMerged = FormProcess.ShowDialog(this, GitCommandHelpers.MergeBranchCmd(Branches.GetSelectedText(), fastForward.Checked, squash.Checked, noCommit.Checked, _NO_TRANSLATE_mergeStrategy.Text)); var wasConflict = MergeConflictHandler.HandleMergeConflicts(this); if (successfullyMerged || wasConflict) { Close(); } }