/// <summary>
/// This method is a part of new functionality. To save backward compatibility previous implementation was left.
/// </summary>
/// <param name="gitCommand"></param>
/// <returns></returns>
private GitCommandResult ExecuteWithCmd(string gitCommand)
{
try
{
var activeRepository = _gitService.ActiveRepositories.FirstOrDefault();
if (activeRepository == null)
{
return new GitCommandResult {
ErrorMessage = Constants.UnknownRepositoryErrorMessage
}
}
;
var gitExePath = GitPathHelper.GetGitPath();
var cmdCommand = "/C \"\"" + (gitExePath ?? "git.exe") + "\" " + gitCommand + "\"";
var gitStartInfo = new ProcessStartInfo
{
CreateNoWindow = true,
RedirectStandardError = true,
RedirectStandardOutput = true,
UseShellExecute = false,
FileName = "cmd.exe",
Arguments = cmdCommand,
WorkingDirectory = activeRepository.RepositoryPath
};
using (var gitProcess = Process.Start(gitStartInfo))
{
var errorMessage = Task.Run(() => gitProcess.StandardError.ReadToEndAsync());
var outputMessage = Task.Run(() => gitProcess.StandardOutput.ReadToEndAsync());
gitProcess.WaitForExit();
return(new GitCommandResult
{
OutputMessage = outputMessage.Result,
ErrorMessage = errorMessage.Result
});
}
}
catch (Exception e)
{
Log.LogException(e);
return(new GitCommandResult {
ErrorMessage = Constants.UnexpectedErrorMessage + Environment.NewLine + $"Find error info in {Log.GetLogFilePath()}"
});
}
}
/// <summary>
/// Run file diff for the specified file in the specified stash.
/// </summary>
/// <param name="stashId">Id of the stash.</param>
/// <param name="filePath">File path.</param>
/// <param name="fileName">File name.</param>
/// <param name="isNew">Indicates that file is new and doesn't have previous version.</param>
/// <param name="isStaged">Indicates that file was staged before the stash.</param>
public void RunDiff(int stashId, string filePath, string fileName, bool isNew, bool isStaged)
{
Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
var beforeTempPath = Path.GetTempFileName();
var afterTempPath = Path.GetTempFileName();
var untrackedTempPath = Path.GetTempFileName();
try
{
if (isNew)
{
if (isStaged)
{
if (!_gitCommandExecuter.TrySaveFileUntrackedStashVersion(stashId, filePath, untrackedTempPath, true, out var error))
{
_teamExplorer?.ShowNotification(error, NotificationType.Error, NotificationFlags.None, null, Guid.NewGuid());
return;
}
else
{
_dte.ItemOperations.OpenFile(untrackedTempPath);
return;
}
}
else
{
if (!_gitCommandExecuter.TrySaveFileUntrackedStashVersion(stashId, filePath, untrackedTempPath, false, out var error))
{
_teamExplorer?.ShowNotification(error, NotificationType.Error, NotificationFlags.None, null, Guid.NewGuid());
return;
}
else
{
_dte.ItemOperations.OpenFile(untrackedTempPath);
return;
}
}
}
if (!_gitCommandExecuter.TrySaveFileBeforeStashVersion(stashId, filePath, beforeTempPath, out var errorMessage))
{
_teamExplorer?.ShowNotification(errorMessage, NotificationType.Error, NotificationFlags.None, null, Guid.NewGuid());
return;
}
if (!_gitCommandExecuter.TrySaveFileAfterStashVersion(stashId, filePath, afterTempPath, out errorMessage))
{
_teamExplorer?.ShowNotification(errorMessage, NotificationType.Error, NotificationFlags.None, null, Guid.NewGuid());
return;
}
_vsDiffService.OpenComparisonWindow2(beforeTempPath, afterTempPath, fileName + " stash diff", "Stash diff", fileName + " before stash", fileName + " after stash", "Stash file content", "", 0);
}
catch (Exception e)
{
Log.LogException(e);
_teamExplorer?.ShowNotification(Constants.UnexpectedErrorMessage + Environment.NewLine + $"Find error info in {Log.GetLogFilePath()}", NotificationType.Error, NotificationFlags.None, null, Guid.NewGuid());
}
finally
{
File.Delete(beforeTempPath);
File.Delete(afterTempPath);
}
}
