void CSyncDlg::FetchComplete()
{
EnableControlButton(true);
SwitchToInput();
this->FetchOutList(true);
ShowTab(IDC_CMD_LOG);
if( (!this->m_GitCmdStatus) && this->m_CurrentCmd == GIT_COMMAND_FETCHANDREBASE)
{
CRebaseDlg dlg;
dlg.m_PostButtonTexts.Add(_T("Email &Patch..."));
int response = dlg.DoModal();
if(response == IDOK)
{
return ;
}
if(response == IDC_REBASE_POST_BUTTON)
{
CString cmd, out, err;
cmd.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
g_Git.m_CurrentDir,
g_Git.FixBranchName(dlg.m_Upstream),
g_Git.FixBranchName(dlg.m_Branch));
if(g_Git.Run(cmd, &out, &err, CP_ACP))
{
CMessageBox::Show(NULL, out + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
return ;
}
CAppUtils::SendPatchMail(cmd,out);
}
}
}
bool RebaseCommand::Execute()
{
bool bRet =false;
if(!g_Git.CheckCleanWorkTree())
{
if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1)
{
CSysProgressDlg sysProgressDlg;
sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
sysProgressDlg.SetShowProgressBar(false);
sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
sysProgressDlg.ShowModeless((HWND)NULL, true);
CString cmd,out;
cmd=_T("git.exe stash");
if (g_Git.Run(cmd, &out, CP_UTF8))
{
sysProgressDlg.Stop();
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
return false;
}
sysProgressDlg.Stop();
}
else
{
return false;
}
}
while(1)
{
CRebaseDlg dlg;
dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_PROC_RESTARTREBASE)));
INT_PTR ret = dlg.DoModal();
if( ret == IDOK)
{
bRet=true;
return bRet;
}
if( ret == IDCANCEL)
{
bRet=false;
return bRet;
}
if (ret == IDC_REBASE_POST_BUTTON)
{
CString cmd = _T("/command:log");
cmd += _T(" /path:\"") + g_Git.m_CurrentDir + _T("\"");
CAppUtils::RunTortoiseProc(cmd);
return true;
}
}
return bRet;
}
void CSyncDlg::FetchComplete()
{
EnableControlButton(true);
SwitchToInput();
this->FetchOutList(true);
if (g_Git.UsingLibGit2(CGit::GIT_CMD_FETCH))
ShowTab(IDC_CMD_GIT_PROG);
else
ShowTab(IDC_REFLIST);
if( (!this->m_GitCmdStatus) && this->m_CurrentCmd == GIT_COMMAND_FETCHANDREBASE)
{
CRebaseDlg dlg;
CString remote, remotebranch;
m_ctrlURL.GetWindowText(remote);
if (!remote.IsEmpty())
{
STRING_VECTOR remotes;
g_Git.GetRemoteList(remotes);
if (std::find(remotes.begin(), remotes.end(), remote) == remotes.end())
remote.Empty();
}
m_ctrlRemoteBranch.GetWindowText(remotebranch);
if (!remote.IsEmpty() && !remotebranch.IsEmpty())
dlg.m_Upstream = _T("remotes/") + remote + _T("/") + remotebranch;
dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
dlg.m_PostButtonTexts.Add(_T("Email &Patch..."));
INT_PTR response = dlg.DoModal();
if(response == IDOK)
{
return ;
}
if (response == IDC_REBASE_POST_BUTTON)
{
CString cmd = _T("/command:log");
cmd += _T(" /path:\"") + g_Git.m_CurrentDir + _T("\"");
CAppUtils::RunTortoiseGitProc(cmd);
}
if(response == IDC_REBASE_POST_BUTTON + 1)
{
CString cmd, out, err;
cmd.Format(_T("git.exe format-patch -o \"%s\" %s..%s"),
g_Git.m_CurrentDir,
g_Git.FixBranchName(dlg.m_Upstream),
g_Git.FixBranchName(dlg.m_Branch));
if (g_Git.Run(cmd, &out, &err, CP_UTF8))
{
CMessageBox::Show(NULL, out + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
return ;
}
CAppUtils::SendPatchMail(cmd,out);
}
}
}
bool RebaseCommand::Execute()
{
bool bRet =false;
if(!g_Git.CheckCleanWorkTree())
{
if(CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES)
{
CString cmd,out;
cmd=_T("git.exe stash");
if(g_Git.Run(cmd,&out,CP_ACP))
{
CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
return false;
}
}
else
{
return false;
}
}
while(1)
{
CRebaseDlg dlg;
dlg.m_PostButtonTexts.Add(_T("Restart Rebase"));
int ret = dlg.DoModal();
if( ret == IDOK)
{
bRet=true;
return bRet;
}
if( ret == IDCANCEL)
{
bRet=false;
return bRet;
}
}
return bRet;
}
bool RebaseCommand::Execute()
{
while(1)
{
CRebaseDlg dlg;
dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_PROC_RESTARTREBASE)));
INT_PTR ret = dlg.DoModal();
if (ret == IDOK)
return true;
if (ret == IDCANCEL)
return false;
if (ret == IDC_REBASE_POST_BUTTON)
{
CString cmd = L"/command:log";
cmd += L" /path:\"" + g_Git.m_CurrentDir + L'"';
CAppUtils::RunTortoiseGitProc(cmd);
return true;
}
}
}
bool SVNRebaseCommand::Execute()
{
if (!GitAdminDir::HasAdminDir(g_Git.m_CurrentDir))
{
CMessageBox::Show(GetExplorerHWND(), IDS_NOWORKINGCOPY, IDS_APPNAME, MB_ICONERROR);
return false;
}
bool isStash = false;
if(!g_Git.CheckCleanWorkTree())
{
if (CMessageBox::Show(GetExplorerHWND(), g_Git.m_CurrentDir + L"\r\n" + CString(MAKEINTRESOURCE(IDS_ERROR_NOCLEAN_STASH)), L"TortoiseGit", 1, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_STASHBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 1)
{
CSysProgressDlg sysProgressDlg;
sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
sysProgressDlg.SetShowProgressBar(false);
sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
sysProgressDlg.ShowModeless(static_cast<HWND>(nullptr), true);
CString out;
if (g_Git.Run(L"git.exe stash", &out, CP_UTF8))
{
sysProgressDlg.Stop();
MessageBox(GetExplorerHWND(), out, L"TortoiseGit", MB_OK | MB_ICONERROR);
return false;
}
sysProgressDlg.Stop();
isStash = true;
}
else
{
return false;
}
}
CRebaseDlg dlg;
// dlg.m_PreCmd=L"git.exe svn fetch";
CString out, err;
if (!g_Git.Run(L"git.exe config svn-remote.svn.fetch", &out, &err, CP_UTF8))
{
int start = out.Find(L':');
if( start >=0 )
out=out.Mid(start);
if (CStringUtils::StartsWith(out, L":refs"))
out = out.Mid(static_cast<int>(wcslen(L":refs")) + 1);
start = 0;
out = out.Tokenize(L"\n", start);
}
else
{
MessageBox(GetExplorerHWND(), L"Could not get \"svn-remote.svn.fetch\" config value.\n" + out + L'\n' + err, L"TortoiseGit", MB_OK | MB_ICONERROR);
return false;
}
dlg.m_Upstream=out;
CGitHash UpStreamOldHash,HeadHash,UpStreamNewHash;
if (g_Git.GetHash(UpStreamOldHash, out))
{
MessageBox(GetExplorerHWND(), g_Git.GetGitLastErr(L"Could not get hash of SVN branch."), L"TortoiseGit", MB_ICONERROR);
return false;
}
if (g_Git.GetHash(HeadHash, L"HEAD"))
{
MessageBox(GetExplorerHWND(), g_Git.GetGitLastErr(L"Could not get HEAD hash."), L"TortoiseGit", MB_ICONERROR);
return false;
}
CProgressDlg progress;
progress.m_GitCmd = L"git.exe svn fetch";
progress.m_AutoClose = AUTOCLOSE_IF_NO_ERRORS;
if(progress.DoModal()!=IDOK)
return false;
if(progress.m_GitStatus)
return false;
if (g_Git.GetHash(UpStreamNewHash, out))
{
MessageBox(GetExplorerHWND(), g_Git.GetGitLastErr(L"Could not get upstream hash after fetching."), L"TortoiseGit", MB_ICONERROR);
return false;
}
//everything updated
if(UpStreamNewHash==HeadHash)
{
MessageBox(GetExplorerHWND(), g_Git.m_CurrentDir + L"\r\n" + CString(MAKEINTRESOURCE(IDS_PROC_EVERYTHINGUPDATED)), L"TortoiseGit", MB_OK | MB_ICONQUESTION);
if(isStash)
askIfUserWantsToStashPop();
return true;
}
//fast forward;
if (g_Git.IsFastForward(L"HEAD", out))
{
CProgressDlg progressReset;
CString cmd;
cmd.Format(L"git.exe reset --hard %s --", static_cast<LPCTSTR>(out));
progressReset.m_GitCmd = cmd;
progressReset.m_AutoClose = AUTOCLOSE_IF_NO_ERRORS;
if (progressReset.DoModal() != IDOK)
return false;
else
{
MessageBox(GetExplorerHWND(), g_Git.m_CurrentDir + L"\r\n" + CString(MAKEINTRESOURCE(IDS_PROC_FASTFORWARD)) + L":\n" + progressReset.m_LogText, L"TortoiseGit", MB_OK | MB_ICONQUESTION);
if(isStash)
askIfUserWantsToStashPop();
return true;
}
}
dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
//need rebase
INT_PTR response = dlg.DoModal();
if (response == IDOK || response == IDC_REBASE_POST_BUTTON)
{
if(isStash)
askIfUserWantsToStashPop();
if (response == IDC_REBASE_POST_BUTTON)
{
CString cmd = L"/command:log";
cmd += L" /path:\"" + g_Git.m_CurrentDir + L'"';
CAppUtils::RunTortoiseGitProc(cmd);
}
return true;
}
return false;
}
bool SVNRebaseCommand::Execute()
{
bool isStash = false;
if(!g_Git.CheckCleanWorkTree())
{
if (CMessageBox::Show(hwndExplorer, g_Git.m_CurrentDir + L"\r\n" + CString(MAKEINTRESOURCE(IDS_ERROR_NOCLEAN_STASH)), L"TortoiseGit", 1, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_STASHBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 1)
{
CSysProgressDlg sysProgressDlg;
sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
sysProgressDlg.SetShowProgressBar(false);
sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
sysProgressDlg.ShowModeless((HWND)NULL, true);
CString cmd,out;
cmd=_T("git.exe stash");
if (g_Git.Run(cmd, &out, CP_UTF8))
{
sysProgressDlg.Stop();
MessageBox(hwndExplorer, out, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
return false;
}
sysProgressDlg.Stop();
isStash = true;
}
else
{
return false;
}
}
CRebaseDlg dlg;
// dlg.m_PreCmd=_T("git.exe svn fetch");
CString cmd, out, err;
cmd = _T("git.exe config svn-remote.svn.fetch");
if (!g_Git.Run(cmd, &out, &err, CP_UTF8))
{
int start = out.Find(_T(':'));
if( start >=0 )
out=out.Mid(start);
if(out.Left(5) == _T(":refs"))
out=out.Mid(6);
start = 0;
out=out.Tokenize(_T("\n"),start);
}
else
{
MessageBox(hwndExplorer, out + L"\n" + err, L"TortoiseGit", MB_OK | MB_ICONERROR);
return false;
}
dlg.m_Upstream=out;
CGitHash UpStreamOldHash,HeadHash,UpStreamNewHash;
if (g_Git.GetHash(UpStreamOldHash, out))
{
MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get hash of SVN branch.")), _T("TortoiseGit"), MB_ICONERROR);
return false;
}
if (g_Git.GetHash(HeadHash, _T("HEAD")))
{
MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
return false;
}
CProgressDlg progress;
progress.m_GitCmd=_T("git.exe svn fetch");
progress.m_AutoClose = AUTOCLOSE_IF_NO_ERRORS;
if(progress.DoModal()!=IDOK)
return false;
if(progress.m_GitStatus)
return false;
if (g_Git.GetHash(UpStreamNewHash, out))
{
MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get upstream hash after fetching.")), _T("TortoiseGit"), MB_ICONERROR);
return false;
}
//everything updated
if(UpStreamNewHash==HeadHash)
{
MessageBox(hwndExplorer, g_Git.m_CurrentDir + _T("\r\n") + CString(MAKEINTRESOURCE(IDS_PROC_EVERYTHINGUPDATED)), _T("TortoiseGit"), MB_OK | MB_ICONQUESTION);
if(isStash)
askIfUserWantsToStashPop();
return true;
}
//fast forward;
if(g_Git.IsFastForward(CString(_T("HEAD")),out))
{
CProgressDlg progressReset;
cmd.Format(_T("git.exe reset --hard %s --"), (LPCTSTR)out);
progressReset.m_GitCmd = cmd;
progressReset.m_AutoClose = AUTOCLOSE_IF_NO_ERRORS;
if (progressReset.DoModal() != IDOK)
return false;
else
{
MessageBox(hwndExplorer, g_Git.m_CurrentDir + _T("\r\n") + CString(MAKEINTRESOURCE(IDS_PROC_FASTFORWARD)) + _T(":\n") + progressReset.m_LogText, _T("TortoiseGit"), MB_OK | MB_ICONQUESTION);
if(isStash)
askIfUserWantsToStashPop();
return true;
}
}
dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
//need rebase
INT_PTR response = dlg.DoModal();
if (response == IDOK || response == IDC_REBASE_POST_BUTTON)
{
if(isStash)
askIfUserWantsToStashPop();
if (response == IDC_REBASE_POST_BUTTON)
{
cmd = _T("/command:log");
cmd += _T(" /path:\"") + g_Git.m_CurrentDir + _T("\"");
CAppUtils::RunTortoiseGitProc(cmd);
}
return true;
}
return false;
}
