private void CherryPickCommitToolStripMenuItemClick(object sender, EventArgs e) { var revisions = GetSelectedRevisions(SortDirection.Descending); FormCherryPickCommitSmall prevForm = null; try { foreach (var r in revisions) { var frm = new FormCherryPickCommitSmall(UICommands, r); if (prevForm != null) { frm.CopyOptions(prevForm); prevForm.Dispose(); } prevForm = frm; if (frm.ShowDialog(this) != DialogResult.OK) { return; } } } finally { if (prevForm != null) { prevForm.Dispose(); } } ForceRefreshRevisions(); OnActionOnRepositoryPerformed(); }
private void CherryPickCommitToolStripMenuItemClick(object sender, EventArgs e) { var revisions = GetSelectedRevisions(SortDirection.Descending); FormCherryPickCommitSmall prevForm = null; try { foreach (var r in revisions) if (Settings.CherryPickSilently && !Settings.Module.IsMerge(r.Guid)) { FormProcess.ShowDialog(this, GitCommandHelpers.CherryPickCmd(r.Guid, true, Settings.CherryPickAddsReference ? "-x" : "")); MergeConflictHandler.HandleMergeConflicts(this, true); } else { var frm = new FormCherryPickCommitSmall(r); if (prevForm != null) { frm.CopyOptions(prevForm); prevForm.Dispose(); } prevForm = frm; if (frm.ShowDialog(this) != DialogResult.OK) break; } } finally { if (prevForm != null) prevForm.Dispose(); } ForceRefreshRevisions(); OnActionOnRepositoryPerformed(); }