void CGitProgressDlg::OnBnClickedLogbutton()
{
switch(m_ProgList.m_Command)
{
case CGitProgressList::GitProgress_Add:
case CGitProgressList::GitProgress_Resolve:
case CGitProgressList::GitProgress_Revert:
{
CString cmd = _T(" /command:commit");
cmd += _T(" /path:\"")+g_Git.m_CurrentDir+_T("\"");
CAppUtils::RunTortoiseGitProc(cmd);
this->EndDialog(IDOK);
break;
}
}
#if 0
if (m_targetPathList.GetCount() != 1)
return;
StringRevMap::iterator it = m_UpdateStartRevMap.begin();
svn_revnum_t rev = -1;
if (it != m_UpdateStartRevMap.end())
{
rev = it->second;
}
CLogDlg dlg;
dlg.SetParams(m_targetPathList[0], m_RevisionEnd, m_RevisionEnd, rev, 0, TRUE);
dlg.DoModal();
#endif
}
bool LogCommand::Execute()
{
//the log command line looks like this:
//command:log path:<path_to_file_or_directory_to_show_the_log_messages> [startrev:<startrevision>] [endrev:<endrevision>]
CString val = parser.GetVal(_T("startrev"));
if ( val.IsEmpty() )
{
// support deprecated parameter prior 1.5.0
val = parser.GetVal(_T("revstart"));
}
GitRev revstart ;
val = parser.GetVal(_T("endrev"));
if ( val.IsEmpty() )
{
// support deprecated parameter prior 1.5.0
val = parser.GetVal(_T("revend"));
}
GitRev revend ;
val = parser.GetVal(_T("limit"));
int limit = _tstoi(val);
val = parser.GetVal(_T("pegrev"));
if ( val.IsEmpty() )
{
// support deprecated parameter prior 1.5.0
val = parser.GetVal(_T("revpeg"));
}
GitRev pegrev;
#if 0
SVNRev pegrev = val.IsEmpty() ? SVNRev() : SVNRev(val);
if (!revstart.IsValid())
revstart = SVNRev::REV_HEAD;
if (!revend.IsValid())
revend = 0;
#endif
if (limit == 0)
{
CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);
limit = (int)(LONG)reg;
}
CLogDlg dlg;
theApp.m_pMainWnd = &dlg;
//dlg.SetParams(cmdLinePath);
dlg.SetParams(cmdLinePath, pegrev, revstart, revend, limit);
// dlg.SetIncludeMerge(!!parser.HasKey(_T("merge")));
// val = parser.GetVal(_T("propspath"));
// if (!val.IsEmpty())
// dlg.SetProjectPropertiesPath(CTSVNPath(val));
dlg.DoModal();
return true;
}
void CRequestPullDlg::OnBnClickedButtonLocalBranch()
{
// use the git log to allow selection of a version
CLogDlg dlg;
CString revision;
m_cStartRevision.GetWindowText(revision);
dlg.SetParams(CTGitPath(), CTGitPath(), revision, revision, 0);
// tell the dialog to use mode for selecting revisions
dlg.SetSelect(true);
// only one revision must be selected however
dlg.SingleSelection(true);
if ( dlg.DoModal() == IDOK )
m_cStartRevision.SetWindowText(dlg.GetSelectedHash().at(0).ToString());
}
void CRepositoryBrowser::OnBnClickedButtonRevision()
{
// use the git log to allow selection of a version
CLogDlg dlg;
dlg.SetParams(CTGitPath(), CTGitPath(), m_sRevision, m_sRevision, 0);
// tell the dialog to use mode for selecting revisions
dlg.SetSelect(true);
// only one revision must be selected however
dlg.SingleSelection(true);
if (dlg.DoModal() == IDOK)
{
// get selected hash if any
m_sRevision = dlg.GetSelectedHash();
Refresh();
}
}
void CFormatPatchDlg::OnBnClickedButtonTo()
{
CLogDlg dlg;
CString revision;
m_cTo.GetWindowText(revision);
dlg.SetParams(CTGitPath(), CTGitPath(), revision, revision, 0);
// tell the dialog to use mode for selecting revisions
dlg.SetSelect(true);
// only one revision must be selected however
dlg.SingleSelection(true);
if (dlg.DoModal() == IDOK && !dlg.GetSelectedHash().empty())
{
m_cTo.AddString(dlg.GetSelectedHash().at(0).ToString());
CheckRadioButton(IDC_RADIO_SINCE, IDC_RADIO_RANGE, IDC_RADIO_RANGE);
OnBnClickedRadio();
}
}
void CRequestPullDlg::OnBnClickedButtonLocalBranch()
{
// use the git log to allow selection of a version
CLogDlg dlg;
CString revision;
m_cStartRevision.GetWindowText(revision);
dlg.SetParams(CTGitPath(), CTGitPath(), revision, revision, 0);
// tell the dialog to use mode for selecting revisions
dlg.SetSelect(true);
// only one revision must be selected however
dlg.SingleSelection(true);
if ( dlg.DoModal() == IDOK )
{
// get selected hash if any
CString selectedHash = dlg.GetSelectedHash();
// load into window, do this even if empty so that it is clear that nothing has been selected
m_cStartRevision.SetWindowText( selectedHash );
}
}
bool SVNFetchCommand::Execute()
{
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, L"Found no SVN remote.", L"TortoiseGit", MB_OK | MB_ICONERROR);
return false;
}
CGitHash upstreamOldHash;
if (g_Git.GetHash(upstreamOldHash, out))
{
MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get upstream hash.")), _T("TortoiseGit"), MB_ICONERROR);
return false;
}
CProgressDlg progress;
progress.m_GitCmd=_T("git.exe svn fetch");
CGitHash upstreamNewHash; // declare outside lambda, because it is captured by reference
progress.m_PostCmdCallback = [&](DWORD status, PostCmdList& postCmdList)
{
if (status)
return;
if (g_Git.GetHash(upstreamNewHash, out))
{
MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get upstream hash after fetching.")), _T("TortoiseGit"), MB_ICONERROR);
return;
}
if (upstreamOldHash == upstreamNewHash)
return;
postCmdList.emplace_back(IDI_DIFF, _T("Fetched Diff"), [&]
{
CLogDlg dlg;
dlg.SetParams(CTGitPath(_T("")), CTGitPath(_T("")), _T(""), upstreamOldHash.ToString() + _T("..") + upstreamNewHash.ToString(), 0);
dlg.DoModal();
});
postCmdList.emplace_back(IDI_LOG, _T("Fetched Log"), [&]
{
CFileDiffDlg dlg;
dlg.SetDiff(nullptr, upstreamNewHash.ToString(), upstreamOldHash.ToString());
dlg.DoModal();
});
};
return progress.DoModal() == IDOK;
}
void CFileDiffDlg::ClickRevButton(CMenuButton *button, GitRev *rev, CACEdit *edit)
{
INT_PTR entry=button->GetCurrentEntry();
if(entry == 0) /* Browse Refence*/
{
{
CString str = CBrowseRefsDlg::PickRef();
if(str.IsEmpty())
return;
if(FillRevFromString(rev,str))
return;
edit->SetWindowText(str);
}
}
if(entry == 1) /*Log*/
{
CLogDlg dlg;
CString revision;
edit->GetWindowText(revision);
dlg.SetParams(CTGitPath(), CTGitPath(), revision, revision, 0);
dlg.SetSelect(true);
if(dlg.DoModal() == IDOK)
{
if (dlg.GetSelectedHash().empty())
return;
if (FillRevFromString(rev, dlg.GetSelectedHash().at(0).ToString()))
return;
edit->SetWindowText(dlg.GetSelectedHash().at(0).ToString());
}
else
return;
}
if(entry == 2) /*RefLog*/
{
CRefLogDlg dlg;
if(dlg.DoModal() == IDOK)
{
if(FillRevFromString(rev,dlg.m_SelectedHash))
return;
edit->SetWindowText(dlg.m_SelectedHash);
}
else
return;
}
SetURLLabels();
InterlockedExchange(&m_bThreadRunning, TRUE);
if (AfxBeginThread(DiffThreadEntry, this)==NULL)
{
InterlockedExchange(&m_bThreadRunning, FALSE);
CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
}
KillTimer(IDT_INPUT);
}
bool PullCommand::Execute()
{
if (!GitAdminDir().HasAdminDir(g_Git.m_CurrentDir)) {
CMessageBox::Show(hwndExplorer, IDS_NOWORKINGCOPY, IDS_APPNAME, MB_ICONERROR);
return false;
}
CPullFetchDlg dlg;
dlg.m_IsPull=TRUE;
if(dlg.DoModal()==IDOK)
{
CString url;
url=dlg.m_RemoteURL;
if(dlg.m_bAutoLoad)
{
CAppUtils::LaunchPAgent(NULL,&dlg.m_RemoteURL);
}
CString cmd;
CGitHash hashOld;
if (g_Git.GetHash(hashOld, _T("HEAD")))
{
MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
return false;
}
CString cmdRebase;
if(dlg.m_bRebase)
cmdRebase = "--rebase ";
CString noff;
CString ffonly;
CString squash;
CString nocommit;
CString notags;
if (!dlg.m_bFetchTags)
notags = _T("--no-tags");
if(dlg.m_bNoFF)
noff=_T("--no-ff");
if (dlg.m_bFFonly)
ffonly = _T("--ff-only");
if(dlg.m_bSquash)
squash=_T("--squash");
if(dlg.m_bNoCommit)
nocommit=_T("--no-commit");
int ver = CAppUtils::GetMsysgitVersion();
if(ver >= 0x01070203) //above 1.7.0.2
cmdRebase += _T("--progress ");
cmd.Format(_T("git.exe pull -v %s %s %s %s %s %s \"%s\" %s"), cmdRebase, noff, ffonly, squash, nocommit, notags, url, dlg.m_RemoteBranchName);
CProgressDlg progress;
progress.m_GitCmd = cmd;
progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_PULL_DIFFS)));
progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_PULL_LOG)));
CTGitPath gitPath = g_Git.m_CurrentDir;
if (gitPath.HasSubmodules())
progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE)));
//progress.m_PostCmdList.Add(_T("Show Conflict"));
if (parser.HasVal(_T("closeonend")))
progress.m_bAutoCloseOnSuccess = !!parser.GetLongVal(_T("closeonend"));
INT_PTR ret = progress.DoModal();
if (ret == IDOK && progress.m_GitStatus == 1 && progress.m_LogText.Find(_T("CONFLICT")) >= 0 && CMessageBox::Show(NULL, IDS_SEECHANGES, IDS_APPNAME, MB_YESNO | MB_ICONINFORMATION) == IDYES)
{
CChangedDlg dlg;
dlg.m_pathList.AddPath(CTGitPath());
dlg.DoModal();
return FALSE;
}
CGitHash hashNew;
if (g_Git.GetHash(hashNew, L"HEAD"))
{
MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get HEAD hash after pulling.")), _T("TortoiseGit"), MB_ICONERROR);
return FALSE;
}
if( ret == IDC_PROGRESS_BUTTON1)
{
if(hashOld == hashNew)
{
if(progress.m_GitStatus == 0)
CMessageBox::Show(NULL, IDS_UPTODATE, IDS_APPNAME, MB_OK | MB_ICONINFORMATION);
return TRUE;
}
CFileDiffDlg dlg;
dlg.SetDiff(NULL, hashNew.ToString(), hashOld.ToString());
dlg.DoModal();
return TRUE;
}
else if ( ret == IDC_PROGRESS_BUTTON1 +1 )
{
if(hashOld == hashNew)
{
if(progress.m_GitStatus == 0)
CMessageBox::Show(NULL, IDS_UPTODATE, IDS_APPNAME, MB_OK | MB_ICONINFORMATION);
return TRUE;
}
CLogDlg dlg;
//dlg.SetParams(cmdLinePath);
dlg.SetParams(CTGitPath(_T("")), CTGitPath(_T("")), _T(""), hashOld.ToString() + _T("..") + hashNew.ToString(), 0);
// dlg.SetIncludeMerge(!!parser.HasKey(_T("merge")));
// val = parser.GetVal(_T("propspath"));
// if (!val.IsEmpty())
// dlg.SetProjectPropertiesPath(CTSVNPath(val));
dlg.DoModal();
}
else if (ret == IDC_PROGRESS_BUTTON1 + 2 && gitPath.HasSubmodules())
{
CString sCmd;
sCmd.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git.m_CurrentDir);
CAppUtils::RunTortoiseGitProc(sCmd);
}
}
return FALSE;
}
bool SVNFetchCommand::Execute()
{
bool autoClose = false;
if (parser.HasVal(_T("closeonend")))
autoClose = !!parser.GetLongVal(_T("closeonend"));
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
{
CMessageBox::Show(NULL, _T("Found no SVN remote."), _T("TortoiseGit"), MB_OK|MB_ICONERROR);
return false;
}
CString upstreamOldHash, upstreamNewHash;
upstreamOldHash = g_Git.GetHash(out);
CProgressDlg progress;
progress.m_GitCmd=_T("git.exe svn fetch");
progress.m_PostCmdList.Add(_T("Fetched Diff"));
progress.m_PostCmdList.Add(_T("Fetched Log"));
progress.m_bAutoCloseOnSuccess = autoClose;
int userResponse = progress.DoModal();
upstreamNewHash = g_Git.GetHash(out);
if (userResponse == IDC_PROGRESS_BUTTON1)
{
if (upstreamOldHash == upstreamNewHash)
{
if (progress.m_GitStatus == 0)
CMessageBox::Show(NULL, L"No new revisions fetched.", L"TortoiseGit Fetch", MB_OK | MB_ICONINFORMATION);
return TRUE;
}
CLogDlg dlg;
dlg.SetParams(CTGitPath(_T("")), CTGitPath(_T("")), _T(""), upstreamOldHash, upstreamNewHash, 0);
dlg.DoModal();
return TRUE;
}
else if (userResponse == IDC_PROGRESS_BUTTON1 + 1)
{
if (upstreamOldHash == upstreamNewHash)
{
if (progress.m_GitStatus == 0)
CMessageBox::Show(NULL, L"No new revisions fetched.", L"TortoiseGit Fetch", MB_OK | MB_ICONINFORMATION);
return TRUE;
}
CFileDiffDlg dlg;
dlg.SetDiff(NULL, upstreamNewHash, upstreamOldHash);
dlg.DoModal();
return TRUE;
}
else
return false;
return true;
}
bool PullCommand::Execute()
{
CPullFetchDlg dlg;
dlg.m_IsPull=TRUE;
if(dlg.DoModal()==IDOK)
{
CString url;
url=dlg.m_RemoteURL;
if(dlg.m_bAutoLoad)
{
CAppUtils::LaunchPAgent(NULL,&dlg.m_RemoteURL);
}
CString cmd;
CString hashOld = g_Git.GetHash(L"HEAD");
CString cmdRebase;
if(dlg.m_bRebase)
cmdRebase = "--rebase ";
CString noff;
CString ffonly;
CString squash;
CString nocommit;
if(dlg.m_bNoFF)
noff=_T("--no-ff");
if (dlg.m_bFFonly)
ffonly = _T("--ff-only");
if(dlg.m_bSquash)
squash=_T("--squash");
if(dlg.m_bNoCommit)
nocommit=_T("--no-commit");
int ver = CAppUtils::GetMsysgitVersion();
if(ver >= 0x01070203) //above 1.7.0.2
cmdRebase += _T("--progress ");
cmd.Format(_T("git.exe pull -v %s %s %s %s %s \"%s\" %s"), cmdRebase, noff, ffonly, squash, nocommit, url, dlg.m_RemoteBranchName);
CProgressDlg progress;
progress.m_GitCmd = cmd;
progress.m_PostCmdList.Add(_T("Pulled Diff"));
progress.m_PostCmdList.Add(_T("Pulled Log"));
CTGitPath gitPath = g_Git.m_CurrentDir;
if (gitPath.HasSubmodules())
progress.m_PostCmdList.Add(_T("Update submodules"));
//progress.m_PostCmdList.Add(_T("Show Conflict"));
if (parser.HasVal(_T("closeonend")))
progress.m_bAutoCloseOnSuccess = !!parser.GetLongVal(_T("closeonend"));
int ret = progress.DoModal();
CString hashNew = g_Git.GetHash(L"HEAD");
if( ret == IDC_PROGRESS_BUTTON1)
{
if(hashOld == hashNew)
{
if(progress.m_GitStatus == 0)
CMessageBox::Show(NULL, L"Already up to date.", L"Pull", MB_OK | MB_ICONINFORMATION);
return TRUE;
}
CFileDiffDlg dlg;
dlg.SetDiff(NULL, hashNew, hashOld);
dlg.DoModal();
return TRUE;
}
else if ( ret == IDC_PROGRESS_BUTTON1 +1 )
{
if(hashOld == hashNew)
{
if(progress.m_GitStatus == 0)
CMessageBox::Show(NULL, L"Already up to date.", L"Pull", MB_OK | MB_ICONINFORMATION);
return TRUE;
}
CLogDlg dlg;
//dlg.SetParams(cmdLinePath);
dlg.SetParams(CTGitPath(_T("")),CTGitPath(_T("")),_T(""), hashOld, hashNew, 0);
// dlg.SetIncludeMerge(!!parser.HasKey(_T("merge")));
// val = parser.GetVal(_T("propspath"));
// if (!val.IsEmpty())
// dlg.SetProjectPropertiesPath(CTSVNPath(val));
dlg.DoModal();
}
else if (ret == IDC_PROGRESS_BUTTON1 + 2 && gitPath.HasSubmodules())
{
CString sCmd;
sCmd.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git.m_CurrentDir);
CAppUtils::RunTortoiseProc(sCmd);
}
}
#if 0
CCloneDlg dlg;
dlg.m_Directory=this->orgCmdLinePath.GetWinPathString();
if(dlg.DoModal()==IDOK)
{
CString dir=dlg.m_Directory;
CString url=dlg.m_URL;
CString cmd;
cmd.Format(_T("git.exe clone %s %s"),
url,
dir);
CProgressDlg progress;
progress.m_GitCmd=cmd;
if(progress.DoModal()==IDOK)
return TRUE;
}
#endif
return FALSE;
}
bool SVNFetchCommand::Execute()
{
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
{
CMessageBox::Show(NULL, _T("Found no SVN remote."), _T("TortoiseGit"), MB_OK|MB_ICONERROR);
return false;
}
CGitHash upstreamOldHash, upstreamNewHash;
if (g_Git.GetHash(upstreamOldHash, out))
{
MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get upstream hash.")), _T("TortoiseGit"), MB_ICONERROR);
return false;
}
CProgressDlg progress;
progress.m_GitCmd=_T("git.exe svn fetch");
progress.m_PostCmdList.Add(_T("Fetched Diff"));
progress.m_PostCmdList.Add(_T("Fetched Log"));
INT_PTR userResponse = progress.DoModal();
::DeleteFile(g_Git.m_CurrentDir + _T("\\sys$command"));
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;
}
if (userResponse == IDC_PROGRESS_BUTTON1)
{
if (upstreamOldHash == upstreamNewHash)
{
if (progress.m_GitStatus == 0)
CMessageBox::Show(NULL, L"No new revisions fetched.", L"TortoiseGit Fetch", MB_OK | MB_ICONINFORMATION);
return true;
}
CLogDlg dlg;
dlg.SetParams(CTGitPath(_T("")), CTGitPath(_T("")), _T(""), upstreamOldHash.ToString() + _T("..") + upstreamNewHash.ToString(), 0);
dlg.DoModal();
return true;
}
else if (userResponse == IDC_PROGRESS_BUTTON1 + 1)
{
if (upstreamOldHash == upstreamNewHash)
{
if (progress.m_GitStatus == 0)
CMessageBox::Show(NULL, L"No new revisions fetched.", L"TortoiseGit Fetch", MB_OK | MB_ICONINFORMATION);
return true;
}
CFileDiffDlg dlg;
dlg.SetDiff(NULL, upstreamNewHash.ToString(), upstreamOldHash.ToString());
dlg.DoModal();
return true;
}
else
return false;
}