private void ConflictedFiles_DoubleClick(object sender, EventArgs e)
{
Cursor.Current = Cursors.WaitCursor;
if (ConflictedFiles.SelectedRows.Count != 1)
{
return;
}
try
{
string filename = GetFileName();
var itemType = GetItemType(filename);
if (itemType == ItemType.Submodule)
{
var form = new FormMergeSubmodule(UICommands, filename);
if (form.ShowDialog() == DialogResult.OK)
{
StageFile(filename);
}
}
else if (itemType == ItemType.File)
{
ResolveFilesConflict(filename);
}
}
finally
{
Cursor.Current = Cursors.Default;
Initialize();
}
}
private void ResolveItemConflict(ConflictData item)
{
var itemType = GetItemType(item.Filename);
if (itemType == ItemType.Submodule)
{
var form = new FormMergeSubmodule(UICommands, item.Filename);
if (form.ShowDialog() == DialogResult.OK)
{
StageFile(item.Filename);
}
}
else if (itemType == ItemType.File)
{
ResolveFilesConflict(item);
}
}
private void ConflictedFiles_DoubleClick(object sender, EventArgs e)
{
Cursor.Current = Cursors.WaitCursor;
if (ConflictedFiles.SelectedRows.Count != 1)
return;
try
{
var item = GetConflict();
var itemType = GetItemType(item.Filename);
if (itemType == ItemType.Submodule)
{
var form = new FormMergeSubmodule(UICommands, item.Filename);
if (form.ShowDialog() == DialogResult.OK)
StageFile(item.Filename);
}
else if (itemType == ItemType.File)
{
ResolveFilesConflict(item);
}
}
finally
{
Cursor.Current = Cursors.Default;
Initialize();
}
}
private void ConflictedFiles_DoubleClick(object sender, EventArgs e)
{
Cursor.Current = Cursors.WaitCursor;
if (ConflictedFiles.SelectedRows.Count != 1)
return;
try
{
string filename = GetFileName();
string fullname = Path.Combine(Module.WorkingDir, filename);
if (Directory.Exists(fullname) && !File.Exists(fullname))
{
if (Module.GetSubmodulesLocalPathes().Contains(filename.Trim()))
{
var form = new FormMergeSubmodule(UICommands, filename);
if (form.ShowDialog() == System.Windows.Forms.DialogResult.OK)
stageFile(filename);
}
}
else
{
ResolveFilesConflict(filename);
}
}
finally
{
Cursor.Current = Cursors.Default;
Initialize();
}
}
