private void FinishFeature()
{
DateTime start = DateTime.Now;
var properties = new Dictionary <string, string>
{
{ "RebaseOnDevelopmentBranch", FeatureRebaseOnDevelopmentBranch.ToString() },
{ "DeleteBranch", FeatureDeleteBranch.ToString() }
};
Logger.Event("FinishFeature", properties);
if (GitFlowPage.ActiveRepo != null)
{
GitFlowPage.ActiveOutputWindow();
ShowProgressBar();
var gf = new VsGitFlowWrapper(GitFlowPage.ActiveRepoPath, GitFlowPage.OutputWindow);
var result = gf.FinishFeature(SelectedFeature.Name, FeatureRebaseOnDevelopmentBranch, FeatureDeleteBranch);
if (!result.Success)
{
ShowErrorMessage(result);
}
HideProgressBar();
ShowFinishFeature = Visibility.Collapsed;
UpdateMenus();
HideAll();
OnPropertyChanged("AllFeatures");
Te.Refresh();
}
Logger.Metric("Duration-FinishFeature", (DateTime.Now - start).Milliseconds);
}
private void FinishFeature()
{
try
{
DateTime start = DateTime.Now;
var properties = new Dictionary <string, string>
{
{ "RebaseOnDevelopmentBranch", FeatureRebaseOnDevelopmentBranch.ToString() },
{ "DeleteLocalBranch", FeatureDeleteLocalBranch.ToString() },
{ "DeleteRemoteBranch", FeatureDeleteRemoteBranch.ToString() },
{ "Squash", FeatureSquash.ToString() },
{ "NoFastForward", FeatureNoFastForward.ToString() }
};
Logger.Event("FinishFeature", properties);
if (GitFlowPage.ActiveRepo != null)
{
GitFlowPage.ActiveOutputWindow();
ShowProgressBar();
var gf = new VsGitFlowWrapper(GitFlowPage.ActiveRepoPath, GitFlowPage.OutputWindow);
if (FeatureSquash)
{
ShowInfoMessage("Waiting for your editor to close the file...");
}
var result = gf.FinishFeature(SelectedFeature.Name, FeatureRebaseOnDevelopmentBranch, FeatureDeleteLocalBranch, FeatureDeleteRemoteBranch, FeatureSquash, FeatureNoFastForward);
if (!result.Success)
{
ShowErrorMessage(result);
}
HideProgressBar();
ShowFinishFeature = Visibility.Collapsed;
UpdateMenus();
HideAll();
OnPropertyChanged("AllFeatures");
if (result.Success)
{
Te.Refresh();
}
}
Logger.Metric("Duration-FinishFeature", (DateTime.Now - start).Milliseconds);
}
catch (Exception ex)
{
ShowErrorMessage(ex.ToString());
Logger.Exception(ex);
}
}
