public override void OnExecute(CommandEventArgs e)
{
// TODO: Choose which conflict to edit if we have more than one!
GitItem conflict = null;
if (e.Command == VisualGitCommand.DocumentConflictEdit)
{
conflict = e.Selection.ActiveDocumentItem;
if (conflict == null || !conflict.IsConflicted)
return;
}
else
foreach (GitItem item in e.Selection.GetSelectedGitItems(false))
{
if (item.IsConflicted)
{
conflict = item;
break;
}
}
if (conflict == null)
return;
conflict.MarkDirty();
if (conflict.Status.State != GitStatus.Conflicted)
{
VisualGitMessageBox mb = new VisualGitMessageBox(e.Context);
mb.Show(string.Format(CommandStrings.TheConflictInXIsAlreadyResolved, conflict.FullPath), CommandStrings.EditConflictTitle,
System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Information);
return;
}
GitInfoArgs args = new GitInfoArgs();
args.PrepareMerge = true;
GitInfoEventArgs conflictInfo = null;
bool ok = false;
ProgressRunnerResult r = e.GetService<IProgressRunner>().RunModal("Retrieving Conflict Information",
delegate(object sender, ProgressWorkerArgs a)
{
ok = a.Client.GetInfo(conflict.FullPath, args, out conflictInfo);
});
if (!ok || !r.Succeeded || conflictInfo == null)
return;
VisualGitMergeArgs da = new VisualGitMergeArgs();
string dir = conflict.Directory;
da.BaseFile = Path.Combine(dir, conflictInfo.ConflictOld ?? conflictInfo.ConflictNew);
da.TheirsFile = Path.Combine(dir, conflictInfo.ConflictNew ?? conflictInfo.ConflictOld);
if (!string.IsNullOrEmpty(conflictInfo.ConflictWork))
da.MineFile = Path.Combine(dir, conflictInfo.ConflictWork);
else
da.MineFile = conflict.FullPath;
da.MergedFile = conflict.FullPath;
da.BaseTitle = "Base";
da.TheirsTitle = "Theirs";
da.MineTitle = "Mine";
da.MergedTitle = conflict.Name;
da.CleanupFiles = new string[] { conflictInfo.ConflictNew, conflictInfo.ConflictOld, conflictInfo.ConflictWork };
e.GetService<IVisualGitDiffHandler>().RunMerge(da);
}
private void EnsureFiles()
{
if (!_preparedFiles)
{
_preparedFiles = true;
var args = new GitInfoArgs { PrepareMerge = true };
GitInfoEventArgs result;
new GitClient().GetInfo(MergedFile, args, out result);
_myFile = result.ConflictWork;
_theirFile = result.ConflictNew;
_baseFile = result.ConflictOld;
}
}