byte GameLogic::opposite_corner_o() {
if (theirs(0)) { return 8; }
else if (theirs(2)) { return 6; }
else if (theirs(6)) { return 2; }
else if (theirs(8)) { return 0; }
else { return NO_POSN; }
}
byte GameLogic::o_corner_hard() {
logic_node = &GameLogic::play_out_hard;
byte block;
if ((block = win_possible(their_mark)) != NO_POSN) {
return block;
} else if (theirs(1) || theirs(3) || theirs(5) || theirs(7)) { // they took an edge, block fork
return opposite_corner_o();
} else { return open_edge(); }
}
byte GameLogic::first_o_hard() {
if (theirs(4)) {
logic_node = &GameLogic::o_center_hard;
return open_corner();
} else if (theirs(0) || theirs(2) || theirs(6) || theirs(8)) {
logic_node = &GameLogic::o_corner_hard;
return 4;
} else { // edge move, worst move for player
logic_node = &GameLogic::o_edge_hard;
return 4;
}
}
byte GameLogic::o_edge_hard() {
logic_node = &GameLogic::play_out_hard;
byte block;
if ((block = win_possible(their_mark)) != NO_POSN) {
return block;
} else if ((block = blocking_corner()) != NO_POSN) {
return block;
} else if (theirs(0) || theirs(2) || theirs(6) || theirs(8)) { // they took an corner, block fork
return opposite_corner_o();
} else {
return open_corner();
}
}
byte GameLogic::second_x_trap() {
if ((mine(6) && theirs(5)) || (mine(2) && theirs(7))) { return 0; }
else if ((mine(8) && theirs(3)) || (mine(0) && theirs(7))) { return 2; }
else if ((mine(8) && theirs(1)) || (mine(0) && theirs(5))) { return 6; }
else if ((mine(2) && theirs(3)) || (mine(6) && theirs(1))) { return 8; }
else { return NO_POSN; }
}
byte GameLogic::blocking_corner() {
byte move_options[4];
int count = 0;
if (open(0) && theirs(1) && theirs(3)) { move_options[count++] = 0; }
if (open(2) && theirs(1) && theirs(5)) { move_options[count++] = 2; }
if (open(6) && theirs(3) && theirs(7)) { move_options[count++] = 6; }
if (open(8) && theirs(5) && theirs(7)) { move_options[count++] = 8; }
if (count) {
return move_options[rand() % count];
} else { return NO_POSN; }
}
bool ConflictEditorCommand::Execute()
{
CTSVNPath merge = cmdLinePath;
CTSVNPath directory = merge.GetDirectory();
bool bRet = false;
bool bAlternativeTool = !!parser.HasKey(_T("alternative"));
// we have the conflicted file (%merged)
// now look for the other required files
SVNStatus stat;
stat.GetStatus(merge);
if (stat.status == NULL)
return false;
if (stat.status->text_status == svn_wc_status_conflicted)
{
// we have a text conflict, use our merge tool to resolve the conflict
CTSVNPath theirs(directory);
CTSVNPath mine(directory);
CTSVNPath base(directory);
bool bConflictData = false;
if ((stat.status->entry)&&(stat.status->entry->conflict_new))
{
theirs.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_new));
bConflictData = true;
}
if ((stat.status->entry)&&(stat.status->entry->conflict_old))
{
base.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_old));
bConflictData = true;
}
if ((stat.status->entry)&&(stat.status->entry->conflict_wrk))
{
mine.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->conflict_wrk));
bConflictData = true;
}
else
{
mine = merge;
}
if (bConflictData)
bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
base, theirs, mine, merge);
}
if (stat.status->prop_status == svn_wc_status_conflicted)
{
// we have a property conflict
CTSVNPath prej(directory);
if ((stat.status->entry)&&(stat.status->entry->prejfile))
{
prej.AppendPathString(CUnicodeUtils::GetUnicode(stat.status->entry->prejfile));
// there's a problem: the prej file contains a _description_ of the conflict, and
// that description string might be translated. That means we have no way of parsing
// the file to find out the conflicting values.
// The only thing we can do: show a dialog with the conflict description, then
// let the user either accept the existing property or open the property edit dialog
// to manually change the properties and values. And a button to mark the conflict as
// resolved.
CEditPropConflictDlg dlg;
dlg.SetPrejFile(prej);
dlg.SetConflictedItem(merge);
bRet = (dlg.DoModal() != IDCANCEL);
}
}
if (stat.status->tree_conflict)
{
// we have a tree conflict
SVNInfo info;
const SVNInfoData * pInfoData = info.GetFirstFileInfo(merge, SVNRev(), SVNRev());
if (pInfoData)
{
if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_text)
{
CTSVNPath theirs(directory);
CTSVNPath mine(directory);
CTSVNPath base(directory);
bool bConflictData = false;
if (pInfoData->treeconflict_theirfile)
{
theirs.AppendPathString(pInfoData->treeconflict_theirfile);
bConflictData = true;
}
if (pInfoData->treeconflict_basefile)
{
base.AppendPathString(pInfoData->treeconflict_basefile);
bConflictData = true;
}
if (pInfoData->treeconflict_myfile)
{
mine.AppendPathString(pInfoData->treeconflict_myfile);
bConflictData = true;
}
else
{
mine = merge;
}
if (bConflictData)
bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
base, theirs, mine, merge);
}
else if (pInfoData->treeconflict_kind == svn_wc_conflict_kind_tree)
{
CString sConflictAction;
CString sConflictReason;
CString sResolveTheirs;
CString sResolveMine;
CTSVNPath treeConflictPath = CTSVNPath(pInfoData->treeconflict_path);
CString sItemName = treeConflictPath.GetUIFileOrDirectoryName();
if (pInfoData->treeconflict_nodekind == svn_node_file)
{
switch (pInfoData->treeconflict_operation)
{
default:
case svn_wc_operation_none:
case svn_wc_operation_update:
switch (pInfoData->treeconflict_action)
{
default:
case svn_wc_conflict_action_edit:
sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEEDIT, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
break;
case svn_wc_conflict_action_add:
sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEADD, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
break;
case svn_wc_conflict_action_delete:
sConflictAction.Format(IDS_TREECONFLICT_FILEUPDATEDELETE, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
break;
}
break;
case svn_wc_operation_switch:
switch (pInfoData->treeconflict_action)
{
default:
case svn_wc_conflict_action_edit:
sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHEDIT, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
break;
case svn_wc_conflict_action_add:
sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHADD, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
break;
case svn_wc_conflict_action_delete:
sConflictAction.Format(IDS_TREECONFLICT_FILESWITCHDELETE, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
break;
}
break;
case svn_wc_operation_merge:
switch (pInfoData->treeconflict_action)
{
default:
case svn_wc_conflict_action_edit:
sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEEDIT, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
break;
case svn_wc_conflict_action_add:
sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEADD, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYFILE);
break;
case svn_wc_conflict_action_delete:
sConflictAction.Format(IDS_TREECONFLICT_FILEMERGEDELETE, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEFILE);
break;
}
break;
}
}
else //if (pInfoData->treeconflict_nodekind == svn_node_dir)
{
switch (pInfoData->treeconflict_operation)
{
default:
case svn_wc_operation_none:
case svn_wc_operation_update:
switch (pInfoData->treeconflict_action)
{
default:
case svn_wc_conflict_action_edit:
sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEEDIT, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
break;
case svn_wc_conflict_action_add:
sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEADD, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
break;
case svn_wc_conflict_action_delete:
sConflictAction.Format(IDS_TREECONFLICT_DIRUPDATEDELETE, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
break;
}
break;
case svn_wc_operation_switch:
switch (pInfoData->treeconflict_action)
{
default:
case svn_wc_conflict_action_edit:
sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHEDIT, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
break;
case svn_wc_conflict_action_add:
sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHADD, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
break;
case svn_wc_conflict_action_delete:
sConflictAction.Format(IDS_TREECONFLICT_DIRSWITCHDELETE, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
break;
}
break;
case svn_wc_operation_merge:
switch (pInfoData->treeconflict_action)
{
default:
case svn_wc_conflict_action_edit:
sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEEDIT, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
break;
case svn_wc_conflict_action_add:
sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEADD, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_KEEPREPOSITORYDIR);
break;
case svn_wc_conflict_action_delete:
sConflictAction.Format(IDS_TREECONFLICT_DIRMERGEDELETE, (LPCTSTR)sItemName);
sResolveTheirs.LoadString(IDS_TREECONFLICT_RESOLVE_REMOVEDIR);
break;
}
break;
}
}
UINT uReasonID = 0;
switch (pInfoData->treeconflict_reason)
{
case svn_wc_conflict_reason_edited:
uReasonID = IDS_TREECONFLICT_REASON_EDITED;
sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
break;
case svn_wc_conflict_reason_obstructed:
uReasonID = IDS_TREECONFLICT_REASON_OBSTRUCTED;
sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
break;
case svn_wc_conflict_reason_deleted:
uReasonID = IDS_TREECONFLICT_REASON_DELETED;
sResolveMine.LoadString(IDS_TREECONFLICT_RESOLVE_MARKASRESOLVED);
break;
case svn_wc_conflict_reason_added:
uReasonID = IDS_TREECONFLICT_REASON_ADDED;
sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
break;
case svn_wc_conflict_reason_missing:
uReasonID = IDS_TREECONFLICT_REASON_MISSING;
sResolveMine.LoadString(IDS_TREECONFLICT_RESOLVE_MARKASRESOLVED);
break;
case svn_wc_conflict_reason_unversioned:
uReasonID = IDS_TREECONFLICT_REASON_UNVERSIONED;
sResolveMine.LoadString(pInfoData->treeconflict_nodekind == svn_node_dir ? IDS_TREECONFLICT_RESOLVE_KEEPLOCALDIR : IDS_TREECONFLICT_RESOLVE_KEEPLOCALFILE);
break;
}
sConflictReason.Format(uReasonID, (LPCTSTR)sConflictAction);
CTreeConflictEditorDlg dlg;
dlg.SetConflictInfoText(sConflictReason);
dlg.SetResolveTexts(sResolveTheirs, sResolveMine);
dlg.SetPath(treeConflictPath);
dlg.SetConflictSources(stat.status->tree_conflict->src_left_version, stat.status->tree_conflict->src_right_version);
dlg.SetConflictReason(pInfoData->treeconflict_reason);
dlg.SetConflictAction(pInfoData->treeconflict_action);
INT_PTR dlgRet = dlg.DoModal();
bRet = (dlgRet != IDCANCEL);
}
}
}
return bRet;
}