private void ContinueButton_Click(object sender, EventArgs e)
        {
            if (Form is null)
            {
                return;
            }

            switch (_action)
            {
            case GitAction.Rebase:
                FormProcess.ShowDialog(Form, GitCommandHelpers.ContinueRebaseCmd());
                break;

            case GitAction.Merge:
                FormProcess.ShowDialog(Form, GitCommandHelpers.ContinueMergeCmd());
                break;

            case GitAction.Patch:
                FormProcess.ShowDialog(Form, GitCommandHelpers.ResolvedCmd());
                break;

            default:
                return;
            }

            Form.UICommands.RepoChangedNotifier.Notify();
        }
        private void ContinueButton_Click(object sender, EventArgs e)
        {
            if (Form is null)
            {
                return;
            }

            switch (_action)
            {
            case GitAction.Rebase:
                FormProcess.ShowDialog(Form, process: null, arguments: GitCommandHelpers.ContinueRebaseCmd(), Module.WorkingDir, input: null, useDialogSettings: true);
                break;

            case GitAction.Merge:
                FormProcess.ShowDialog(Form, process: null, arguments: GitCommandHelpers.ContinueMergeCmd(), Module.WorkingDir, input: null, useDialogSettings: true);
                break;

            case GitAction.Patch:
                FormProcess.ShowDialog(Form, process: null, arguments: GitCommandHelpers.ResolvedCmd(), Module.WorkingDir, input: null, useDialogSettings: true);
                break;

            default:
                return;
            }

            Form.UICommands.RepoChangedNotifier.Notify();
        }
Exemple #3
0
        private void ResolvedClick(object sender, EventArgs e)
        {
            Cursor.Current = Cursors.WaitCursor;
            FormProcess.ShowDialog(this, GitCommandHelpers.ContinueRebaseCmd());

            if (!Module.InTheMiddleOfRebase())
                Close();

            EnableButtons();
            patchGrid1.Initialize();
            Cursor.Current = Cursors.Default;
        }
Exemple #4
0
        private void ResolvedClick(object sender, EventArgs e)
        {
            using (WaitCursorScope.Enter())
            {
                FormProcess.ShowDialog(this, GitCommandHelpers.ContinueRebaseCmd());

                if (!Module.InTheMiddleOfRebase())
                {
                    Close();
                }

                EnableButtons();
                patchGrid1.Initialize();
            }
        }
        private void ResolvedClick(object sender, EventArgs e)
        {
            using (WaitCursorScope.Enter())
            {
                FormProcess.ShowDialog(this, process: null, arguments: GitCommandHelpers.ContinueRebaseCmd(), Module.WorkingDir, input: null, useDialogSettings: true);

                if (!Module.InTheMiddleOfRebase())
                {
                    Close();
                }

                EnableButtons();
                patchGrid1.Initialize();
            }
        }