Skip to content

Commit

Permalink
FormCheckoutRevision: make similar to CreateBranch/Tag dialogs. Do no…
Browse files Browse the repository at this point in the history
…t refresh grid when user hits cancel.
  • Loading branch information
australiensun committed Mar 4, 2013

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 94fec18 commit 208d1fb
Showing 3 changed files with 77 additions and 32 deletions.
85 changes: 64 additions & 21 deletions GitUI/CommandsDialogs/FormCheckoutRevision.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions GitUI/CommandsDialogs/FormCheckoutRevision.cs
Original file line number Diff line number Diff line change
@@ -28,18 +28,24 @@ public FormCheckoutRevision(GitUICommands aCommands)
Translate();
}

private void FormCheckoutLoad(object sender, EventArgs e)
{

}

private void OkClick(object sender, EventArgs e)
{
try
{
if (RevisionGrid.GetSelectedRevisions().Count != 1)
var commitHash = commitPickerSmallControl1.SelectedCommitHash;

if (commitHash.IsNullOrEmpty())
{
MessageBox.Show(this, _noRevisionSelectedMsgBox.Text, _noRevisionSelectedMsgBoxCaption.Text);
return;
}

string command = GitCommandHelpers.CheckoutCmd(RevisionGrid.GetSelectedRevisions()[0].Guid,
Force.Checked ? LocalChangesAction.Reset : 0);
string command = GitCommandHelpers.CheckoutCmd(commitHash, Force.Checked ? LocalChangesAction.Reset : 0);

FormProcess.ShowDialog(this, command);

@@ -50,10 +56,5 @@ private void OkClick(object sender, EventArgs e)
Trace.WriteLine(ex.Message);
}
}

private void FormCheckoutLoad(object sender, EventArgs e)
{
RevisionGrid.Load();
}
}
}
7 changes: 4 additions & 3 deletions GitUI/GitUICommands.cs
Original file line number Diff line number Diff line change
@@ -451,11 +451,12 @@ public bool StartCompareRevisionsDialog(IWin32Window owner)
Func<bool> action = () =>
{
using (var form = new FormLog(this))
form.ShowDialog(owner);
return true;
{
return form.ShowDialog(owner) == DialogResult.OK;
}
};

return DoActionOnRepo(owner, true, false, PreCompareRevisions, PostCompareRevisions, action);
return DoActionOnRepo(owner, true, true, PreCompareRevisions, PostCompareRevisions, action);
}

public bool StartCompareRevisionsDialog()

0 comments on commit 208d1fb

Please sign in to comment.