1 // TortoiseGit - a Windows shell extension for easy version control
\r
3 // Copyright (C) 2003-2008 - TortoiseGit
\r
5 // This program is free software; you can redistribute it and/or
\r
6 // modify it under the terms of the GNU General Public License
\r
7 // as published by the Free Software Foundation; either version 2
\r
8 // of the License, or (at your option) any later version.
\r
10 // This program is distributed in the hope that it will be useful,
\r
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
13 // GNU General Public License for more details.
\r
15 // You should have received a copy of the GNU General Public License
\r
16 // along with this program; if not, write to the Free Software Foundation,
\r
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
20 #include "TortoiseProc.h"
\r
21 #include "UnicodeUtils.h"
\r
22 #include "MessageBox.h"
\r
23 #include "AppUtils.h"
\r
24 #include "TempFile.h"
\r
25 #include "ProgressDlg.h"
\r
26 #include "SysImageList.h"
\r
27 //#include "GitProperties.h"
\r
28 #include "StringUtils.h"
\r
29 #include "PathUtils.h"
\r
30 #include "BrowseFolder.h"
\r
31 #include "RevisionDlg.h"
\r
32 #include ".\filediffdlg.h"
\r
33 #include "gitdiff.h"
\r
34 #include "CommonResource.h"
\r
36 #define ID_COMPARE 1
\r
40 #define ID_CLIPBOARD 5
\r
42 BOOL CFileDiffDlg::m_bAscending = FALSE;
\r
43 int CFileDiffDlg::m_nSortedColumn = -1;
\r
46 IMPLEMENT_DYNAMIC(CFileDiffDlg, CResizableStandAloneDialog)
\r
47 CFileDiffDlg::CFileDiffDlg(CWnd* pParent /*=NULL*/)
\r
48 : CResizableStandAloneDialog(CFileDiffDlg::IDD, pParent),
\r
55 CFileDiffDlg::~CFileDiffDlg()
\r
57 DestroyIcon(m_hSwitchIcon);
\r
60 void CFileDiffDlg::DoDataExchange(CDataExchange* pDX)
\r
62 CResizableStandAloneDialog::DoDataExchange(pDX);
\r
63 DDX_Control(pDX, IDC_FILELIST, m_cFileList);
\r
64 DDX_Control(pDX, IDC_SWITCHLEFTRIGHT, m_SwitchButton);
\r
65 DDX_Control(pDX, IDC_REV1BTN, m_cRev1Btn);
\r
66 DDX_Control(pDX, IDC_REV2BTN, m_cRev2Btn);
\r
67 DDX_Control(pDX, IDC_FILTER, m_cFilter);
\r
71 BEGIN_MESSAGE_MAP(CFileDiffDlg, CResizableStandAloneDialog)
\r
72 ON_NOTIFY(NM_DBLCLK, IDC_FILELIST, OnNMDblclkFilelist)
\r
73 ON_NOTIFY(LVN_GETINFOTIP, IDC_FILELIST, OnLvnGetInfoTipFilelist)
\r
74 ON_NOTIFY(NM_CUSTOMDRAW, IDC_FILELIST, OnNMCustomdrawFilelist)
\r
77 ON_EN_SETFOCUS(IDC_SECONDURL, &CFileDiffDlg::OnEnSetfocusSecondurl)
\r
78 ON_EN_SETFOCUS(IDC_FIRSTURL, &CFileDiffDlg::OnEnSetfocusFirsturl)
\r
79 ON_BN_CLICKED(IDC_SWITCHLEFTRIGHT, &CFileDiffDlg::OnBnClickedSwitchleftright)
\r
80 ON_NOTIFY(HDN_ITEMCLICK, 0, &CFileDiffDlg::OnHdnItemclickFilelist)
\r
81 ON_BN_CLICKED(IDC_REV1BTN, &CFileDiffDlg::OnBnClickedRev1btn)
\r
82 ON_BN_CLICKED(IDC_REV2BTN, &CFileDiffDlg::OnBnClickedRev2btn)
\r
83 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
\r
84 ON_EN_CHANGE(IDC_FILTER, &CFileDiffDlg::OnEnChangeFilter)
\r
89 void CFileDiffDlg::SetDiff(CTGitPath * path, GitRev rev1, GitRev rev2)
\r
100 void CFileDiffDlg::SetDiff(CTGitPath * path, CString &hash1, CString &hash2)
\r
108 BYTE_VECTOR logout;
\r
110 g_Git.GetLog(logout,hash1,path,1,0);
\r
111 m_rev1.ParserFromLog(logout);
\r
115 g_Git.GetLog(logout,hash2,path,1,0);
\r
116 m_rev2.ParserFromLog(logout);
\r
118 void CFileDiffDlg::SetDiff(CTGitPath * path, GitRev rev1)
\r
126 m_rev2.m_CommitHash = _T("");
\r
127 m_rev2.m_Subject = _T("Previou Version");
\r
129 //this->GetDlgItem()->EnableWindow(FALSE);
\r
134 BOOL CFileDiffDlg::OnInitDialog()
\r
136 CResizableStandAloneDialog::OnInitDialog();
\r
139 m_tooltips.Create(this);
\r
140 m_tooltips.AddTool(IDC_SWITCHLEFTRIGHT, IDS_FILEDIFF_SWITCHLEFTRIGHT_TT);
\r
142 m_cFileList.SetRedraw(false);
\r
143 m_cFileList.DeleteAllItems();
\r
144 DWORD exStyle = LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP;
\r
145 m_cFileList.SetExtendedStyle(exStyle);
\r
147 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
\r
148 m_cFileList.SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
\r
150 m_hSwitchIcon = (HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_SWITCHLEFTRIGHT), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
\r
151 m_SwitchButton.SetIcon(m_hSwitchIcon);
\r
153 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
\r
154 m_cFilter.SetInfoIcon(IDI_FILTEREDIT);
\r
155 temp.LoadString(IDS_FILEDIFF_FILTERCUE);
\r
156 temp = _T(" ")+temp;
\r
157 m_cFilter.SetCueBanner(temp);
\r
159 int c = ((CHeaderCtrl*)(m_cFileList.GetDlgItem(0)))->GetItemCount()-1;
\r
161 m_cFileList.DeleteColumn(c--);
\r
164 temp.LoadString(IDS_FILEDIFF_FILE);
\r
165 m_cFileList.InsertColumn(0, temp);
\r
166 temp.LoadString(IDS_FILEDIFF_ACTION);
\r
167 m_cFileList.InsertColumn(1, temp);
\r
169 temp.LoadString(IDS_FILEDIFF_STATADD);
\r
170 m_cFileList.InsertColumn(2, temp);
\r
171 temp.LoadString(IDS_FILEDIFF_STATDEL);
\r
172 m_cFileList.InsertColumn(3, temp);
\r
175 int maxcol = ((CHeaderCtrl*)(m_cFileList.GetDlgItem(0)))->GetItemCount()-1;
\r
177 for (col = mincol; col <= maxcol; col++)
\r
179 m_cFileList.SetColumnWidth(col,LVSCW_AUTOSIZE_USEHEADER);
\r
182 m_cFileList.SetRedraw(true);
\r
184 AddAnchor(IDC_DIFFSTATIC1, TOP_LEFT, TOP_RIGHT);
\r
185 AddAnchor(IDC_SWITCHLEFTRIGHT, TOP_RIGHT);
\r
186 AddAnchor(IDC_FIRSTURL, TOP_LEFT, TOP_RIGHT);
\r
187 AddAnchor(IDC_REV1BTN, TOP_RIGHT);
\r
188 AddAnchor(IDC_DIFFSTATIC2, TOP_LEFT, TOP_RIGHT);
\r
189 AddAnchor(IDC_SECONDURL, TOP_LEFT, TOP_RIGHT);
\r
190 AddAnchor(IDC_REV2BTN, TOP_RIGHT);
\r
191 AddAnchor(IDC_FILTER, TOP_LEFT, TOP_RIGHT);
\r
192 AddAnchor(IDC_FILELIST, TOP_LEFT, BOTTOM_RIGHT);
\r
196 EnableSaveRestore(_T("FileDiffDlg"));
\r
198 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
199 if (AfxBeginThread(DiffThreadEntry, this)==NULL)
\r
201 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
202 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
205 // Start with focus on file list
\r
206 GetDlgItem(IDC_FILELIST)->SetFocus();
\r
208 if(m_rev2.m_CommitHash.IsEmpty())
\r
209 m_SwitchButton.EnableWindow(FALSE);
\r
214 svn_error_t* CFileDiffDlg::DiffSummarizeCallback(const CTGitPath& path,
\r
215 svn_client_diff_summarize_kind_t kind,
\r
216 bool propchanged, svn_node_kind_t node)
\r
222 fd.propchanged = propchanged;
\r
223 m_arFileList.push_back(fd);
\r
224 return Git_NO_ERROR;
\r
228 UINT CFileDiffDlg::DiffThreadEntry(LPVOID pVoid)
\r
230 return ((CFileDiffDlg*)pVoid)->DiffThread();
\r
233 UINT CFileDiffDlg::DiffThread()
\r
235 bool bSuccess = true;
\r
237 m_cFileList.ShowText(CString(MAKEINTRESOURCE(IDS_FILEDIFF_WAIT)));
\r
238 m_arFileList.Clear();
\r
242 // bSuccess = DiffSummarizePeg(m_path1, m_peg, m_rev1, m_rev2, m_depth, m_bIgnoreancestry);
\r
246 // bSuccess = DiffSummarize(m_path1, m_rev1, m_path2, m_rev2, m_depth, m_bIgnoreancestry);
\r
250 // m_cFileList.ShowText(GetLastErrorMessage());
\r
251 // InterlockedExchange(&m_bThreadRunning, FALSE);
\r
256 CString rev1=m_rev1.m_CommitHash;
\r
257 if(this->m_rev1.m_CommitHash == GIT_REV_ZERO || this->m_rev2.m_CommitHash == GIT_REV_ZERO)
\r
260 if(this->m_rev1.m_CommitHash == GIT_REV_ZERO)
\r
261 cmd.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s"),m_rev2.m_CommitHash);
\r
263 cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s"),m_rev1.m_CommitHash);
\r
266 cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s"),m_rev2.m_CommitHash,rev1);
\r
270 g_Git.Run(cmd,&out);
\r
271 this->m_arFileList.ParserFromLog(out);
\r
273 CString sFilterText;
\r
274 m_cFilter.GetWindowText(sFilterText);
\r
275 m_cFileList.SetRedraw(false);
\r
276 Filter(sFilterText);
\r
277 if (m_arFileList.GetCount()>0)
\r
279 // Highlight first entry in file list
\r
280 m_cFileList.SetSelectionMark(0);
\r
281 m_cFileList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
\r
285 int maxcol = ((CHeaderCtrl*)(m_cFileList.GetDlgItem(0)))->GetItemCount()-1;
\r
287 for (col = mincol; col <= maxcol; col++)
\r
289 m_cFileList.SetColumnWidth(col,LVSCW_AUTOSIZE_USEHEADER);
\r
292 m_cFileList.ClearText();
\r
293 m_cFileList.SetRedraw(true);
\r
295 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
296 InvalidateRect(NULL);
\r
301 int CFileDiffDlg::AddEntry(const CTGitPath * fd)
\r
306 int index = m_cFileList.GetItemCount();
\r
309 // if (fd->node == svn_node_dir)
\r
310 // icon_idx = m_nIconFolder;
\r
313 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(fd->GetGitPathString());
\r
316 ret = m_cFileList.InsertItem(index, fd->GetGitPathString(), icon_idx);
\r
317 m_cFileList.SetItemText(index, 1, ((CTGitPath*)fd)->GetActionName());
\r
318 m_cFileList.SetItemText(index, 2, ((CTGitPath*)fd)->m_StatAdd);
\r
319 m_cFileList.SetItemText(index, 3, ((CTGitPath*)fd)->m_StatDel);
\r
324 void CFileDiffDlg::DoDiff(int selIndex, bool blame)
\r
328 CTGitPath* fd = m_arFilteredList[selIndex];
\r
329 diff.Diff(fd, fd,this->m_rev1.m_CommitHash, this->m_rev2.m_CommitHash, blame, FALSE);
\r
332 CFileDiffDlg::CTGitPath* fd = m_arFilteredList[selIndex];
\r
334 CTGitPath url1 = CTGitPath(m_path1.GetGitPathString() + _T("/") + fd.path.GetGitPathString());
\r
335 CTGitPath url2 = m_bDoPegDiff ? url1 : CTGitPath(m_path2.GetGitPathString() + _T("/") + fd.path.GetGitPathString());
\r
337 if (fd.kind == svn_client_diff_summarize_kind_deleted)
\r
339 if (!PathIsURL(url1))
\r
340 url1 = CTGitPath(GetURLFromPath(m_path1) + _T("/") + fd.path.GetGitPathString());
\r
341 if (!PathIsURL(url2))
\r
342 url2 = m_bDoPegDiff ? url1 : CTGitPath(GetURLFromPath(m_path2) + _T("/") + fd.path.GetGitPathString());
\r
345 if (fd.propchanged)
\r
347 DiffProps(selIndex);
\r
349 if (fd.node == svn_node_dir)
\r
352 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, m_path1, m_rev1);
\r
354 CProgressDlg progDlg;
\r
355 progDlg.SetTitle(IDS_PROGRESSWAIT);
\r
356 progDlg.SetAnimation(IDR_DOWNLOAD);
\r
357 progDlg.ShowModeless(this);
\r
358 progDlg.FormatPathLine(1, IDS_PROGRESSGETFILE, (LPCTSTR)m_path1.GetUIPathString());
\r
359 progDlg.FormatNonPathLine(2, IDS_PROGRESSREVISIONTEXT, (LPCTSTR)m_rev1.ToString());
\r
361 if ((fd.kind != svn_client_diff_summarize_kind_added)&&(!blame)&&(!Cat(url1, m_bDoPegDiff ? m_peg : m_rev1, m_rev1, tempfile)))
\r
363 if ((!m_bDoPegDiff)||(!Cat(url1, m_rev1, m_rev1, tempfile)))
\r
365 CMessageBox::Show(NULL, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
369 else if ((fd.kind != svn_client_diff_summarize_kind_added)&&(blame)&&(!m_blamer.BlameToFile(url1, 1, m_rev1, m_bDoPegDiff ? m_peg : m_rev1, tempfile, _T(""), TRUE, TRUE)))
\r
371 if ((!m_bDoPegDiff)||(!m_blamer.BlameToFile(url1, 1, m_rev1, m_rev1, tempfile, _T(""), TRUE, TRUE)))
\r
373 CMessageBox::Show(NULL, m_blamer.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
377 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
378 progDlg.SetProgress(1, 2);
\r
379 progDlg.FormatPathLine(1, IDS_PROGRESSGETFILE, (LPCTSTR)url2.GetUIPathString());
\r
380 progDlg.FormatNonPathLine(2, IDS_PROGRESSREVISIONTEXT, (LPCTSTR)m_rev2.ToString());
\r
381 CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, url2, m_rev2);
\r
382 if ((fd.kind != svn_client_diff_summarize_kind_deleted)&&(!blame)&&(!Cat(url2, m_bDoPegDiff ? m_peg : m_rev2, m_rev2, tempfile2)))
\r
384 if ((!m_bDoPegDiff)||(!Cat(url2, m_rev2, m_rev2, tempfile2)))
\r
386 CMessageBox::Show(NULL, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
390 else if ((fd.kind != svn_client_diff_summarize_kind_deleted)&&(blame)&&(!m_blamer.BlameToFile(url2, 1, m_bDoPegDiff ? m_peg : m_rev2, m_rev2, tempfile2, _T(""), TRUE, TRUE)))
\r
392 if ((!m_bDoPegDiff)||(!m_blamer.BlameToFile(url2, 1, m_rev2, m_rev2, tempfile2, _T(""), TRUE, TRUE)))
\r
394 CMessageBox::Show(NULL, m_blamer.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
398 SetFileAttributes(tempfile2.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
399 progDlg.SetProgress(2,2);
\r
402 CString rev1name, rev2name;
\r
405 rev1name.Format(_T("%s Revision %ld"), (LPCTSTR)fd.path.GetGitPathString(), (LONG)m_rev1);
\r
406 rev2name.Format(_T("%s Revision %ld"), (LPCTSTR)fd.path.GetGitPathString(), (LONG)m_rev2);
\r
410 rev1name = m_path1.GetGitPathString() + _T("/") + fd.path.GetGitPathString();
\r
411 rev2name = m_path2.GetGitPathString() + _T("/") + fd.path.GetGitPathString();
\r
413 CAppUtils::DiffFlags flags;
\r
414 flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
415 flags.Blame(blame);
\r
416 CAppUtils::StartExtDiff(
\r
417 tempfile, tempfile2, rev1name, rev2name, flags);
\r
422 void CFileDiffDlg::DiffProps(int selIndex)
\r
424 CFileDiffDlg::CTGitPath* fd = m_arFilteredList[selIndex];
\r
426 CTGitPath url1 = CTGitPath(m_path1.GetGitPathString() + _T("/") + fd.path.GetGitPathString());
\r
427 CTGitPath url2 = m_bDoPegDiff ? url1 : CTGitPath(m_path2.GetGitPathString() + _T("/") + fd.path.GetGitPathString());
\r
429 GitProperties propsurl1(url1, m_rev1, false);
\r
430 GitProperties propsurl2(url2, m_rev2, false);
\r
432 // collect the properties of both revisions in a set
\r
433 std::set<stdstring> properties;
\r
434 for (int wcindex = 0; wcindex < propsurl1.GetCount(); ++wcindex)
\r
436 stdstring urlname = propsurl1.GetItemName(wcindex);
\r
437 if ( properties.find(urlname) == properties.end() )
\r
439 properties.insert(urlname);
\r
442 for (int wcindex = 0; wcindex < propsurl2.GetCount(); ++wcindex)
\r
444 stdstring urlname = propsurl2.GetItemName(wcindex);
\r
445 if ( properties.find(urlname) == properties.end() )
\r
447 properties.insert(urlname);
\r
451 // iterate over all properties and diff the properties
\r
452 for (std::set<stdstring>::iterator iter = properties.begin(), end = properties.end(); iter != end; ++iter)
\r
454 stdstring url1name = *iter;
\r
456 stdstring url1value = _T(""); // CUnicodeUtils::StdGetUnicode((char *)propsurl1.GetItemValue(wcindex).c_str());
\r
457 for (int url1index = 0; url1index < propsurl1.GetCount(); ++url1index)
\r
459 if (propsurl1.GetItemName(url1index).compare(url1name)==0)
\r
461 url1value = CString((char *)propsurl1.GetItemValue(url1index).c_str());
\r
465 stdstring url2value = _T("");
\r
466 for (int url2index = 0; url2index < propsurl2.GetCount(); ++url2index)
\r
468 if (propsurl2.GetItemName(url2index).compare(url1name)==0)
\r
470 url2value = CString((char *)propsurl2.GetItemValue(url2index).c_str());
\r
474 if (url2value.compare(url1value)!=0)
\r
476 // write both property values to temporary files
\r
477 CTGitPath url1propfile = CTempFiles::Instance().GetTempFilePath(false);
\r
478 CTGitPath url2propfile = CTempFiles::Instance().GetTempFilePath(false);
\r
480 _tfopen_s(&pFile, url1propfile.GetWinPath(), _T("wb"));
\r
483 fputs(CUnicodeUtils::StdGetUTF8(url1value).c_str(), pFile);
\r
486 _tfopen_s(&pFile, url2propfile.GetWinPath(), _T("wb"));
\r
489 fputs(CUnicodeUtils::StdGetUTF8(url2value).c_str(), pFile);
\r
497 SetFileAttributes(url1propfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
498 SetFileAttributes(url2propfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
\r
500 if (m_rev1.IsWorking())
\r
501 n1.Format(IDS_DIFF_WCNAME, url1name.c_str());
\r
502 if (m_rev1.IsBase())
\r
503 n1.Format(IDS_DIFF_BASENAME, url1name.c_str());
\r
504 if (m_rev1.IsHead() || m_rev1.IsNumber())
\r
508 n1.Format(_T("%s : %s Revision %ld"), url1name.c_str(), (LPCTSTR)fd.path.GetGitPathString(), (LONG)m_rev1);
\r
512 CString sTemp = url1name.c_str();
\r
513 sTemp += _T(" : ");
\r
514 n1 = sTemp + m_path1.GetGitPathString() + _T("/") + fd.path.GetGitPathString();
\r
517 if (m_rev2.IsWorking())
\r
518 n2.Format(IDS_DIFF_WCNAME, url1name.c_str());
\r
519 if (m_rev2.IsBase())
\r
520 n2.Format(IDS_DIFF_BASENAME, url1name.c_str());
\r
521 if (m_rev2.IsHead() || m_rev2.IsNumber())
\r
525 n2.Format(_T("%s : %s Revision %ld"), url1name.c_str(), (LPCTSTR)fd.path.GetGitPathString(), (LONG)m_rev2);
\r
529 CString sTemp = url1name.c_str();
\r
530 sTemp += _T(" : ");
\r
531 n2 = sTemp + m_path2.GetGitPathString() + _T("/") + fd.path.GetGitPathString();
\r
534 CAppUtils::StartExtDiffProps(url1propfile, url2propfile, n1, n2, TRUE);
\r
539 void CFileDiffDlg::OnNMDblclkFilelist(NMHDR *pNMHDR, LRESULT *pResult)
\r
542 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
543 int selIndex = pNMLV->iItem;
\r
546 if (selIndex >= (int)m_arFilteredList.size())
\r
549 DoDiff(selIndex, m_bBlame);
\r
552 void CFileDiffDlg::OnLvnGetInfoTipFilelist(NMHDR *pNMHDR, LRESULT *pResult)
\r
555 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
\r
556 if (pGetInfoTip->iItem >= (int)m_arFilteredList.size())
\r
559 CString path = m_path1.GetGitPathString() + _T("/") + m_arFilteredList[pGetInfoTip->iItem]->GetGitPathString();
\r
560 if (pGetInfoTip->cchTextMax > path.GetLength())
\r
561 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, path, pGetInfoTip->cchTextMax);
\r
566 void CFileDiffDlg::OnNMCustomdrawFilelist(NMHDR *pNMHDR, LRESULT *pResult)
\r
568 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
569 // Take the default processing unless we set this to something else below.
\r
570 *pResult = CDRF_DODEFAULT;
\r
572 // First thing - check the draw stage. If it's the control's prepaint
\r
573 // stage, then tell Windows we want messages for every item.
\r
575 if ( CDDS_PREPAINT == pLVCD->nmcd.dwDrawStage )
\r
577 *pResult = CDRF_NOTIFYITEMDRAW;
\r
579 else if ( CDDS_ITEMPREPAINT == pLVCD->nmcd.dwDrawStage )
\r
581 // This is the prepaint stage for an item. Here's where we set the
\r
582 // item's text color. Our return value will tell Windows to draw the
\r
583 // item itself, but it will use the new color we set here.
\r
585 // Tell Windows to paint the control itself.
\r
586 *pResult = CDRF_DODEFAULT;
\r
588 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
590 if (m_arFilteredList.size() > pLVCD->nmcd.dwItemSpec)
\r
592 CTGitPath * fd = m_arFilteredList[pLVCD->nmcd.dwItemSpec];
\r
593 switch (fd->m_Action)
\r
595 case CTGitPath::LOGACTIONS_ADDED:
\r
596 crText = m_colors.GetColor(CColors::Added);
\r
598 case CTGitPath::LOGACTIONS_DELETED:
\r
599 crText = m_colors.GetColor(CColors::Deleted);
\r
601 case CTGitPath::LOGACTIONS_MODIFIED:
\r
602 crText = m_colors.GetColor(CColors::Modified);
\r
604 //case svn_client_diff_summarize_kind_normal:
\r
606 //if (fd.propchanged)
\r
607 crText = m_colors.GetColor(CColors::PropertyChanged);
\r
611 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
612 pLVCD->clrText = crText;
\r
616 void CFileDiffDlg::OnContextMenu(CWnd* pWnd, CPoint point)
\r
618 if ((pWnd==0)||(pWnd != &m_cFileList))
\r
620 if (m_cFileList.GetSelectedCount() == 0)
\r
622 // if the context menu is invoked through the keyboard, we have to use
\r
623 // a calculated position on where to anchor the menu on
\r
624 if ((point.x == -1) && (point.y == -1))
\r
627 m_cFileList.GetItemRect(m_cFileList.GetSelectionMark(), &rect, LVIR_LABEL);
\r
628 m_cFileList.ClientToScreen(&rect);
\r
629 point = rect.CenterPoint();
\r
632 if (popup.CreatePopupMenu())
\r
635 temp.LoadString(IDS_LOG_POPUP_COMPARETWO);
\r
636 popup.AppendMenu(MF_STRING | MF_ENABLED, ID_COMPARE, temp);
\r
637 temp.LoadString(IDS_FILEDIFF_POPBLAME);
\r
638 //popup.AppendMenu(MF_STRING | MF_ENABLED, ID_BLAME, temp);
\r
639 popup.AppendMenu(MF_SEPARATOR, NULL);
\r
640 temp.LoadString(IDS_FILEDIFF_POPSAVELIST);
\r
641 popup.AppendMenu(MF_STRING | MF_ENABLED, ID_SAVEAS, temp);
\r
642 temp.LoadString(IDS_FILEDIFF_POPCLIPBOARD);
\r
643 popup.AppendMenu(MF_STRING | MF_ENABLED, ID_CLIPBOARD, temp);
\r
644 temp.LoadString(IDS_FILEDIFF_POPEXPORT);
\r
645 //popup.AppendMenu(MF_STRING | MF_ENABLED, ID_EXPORT, temp);
\r
646 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
647 m_bCancelled = false;
\r
652 POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
\r
655 int index = m_cFileList.GetNextSelectedItem(pos);
\r
656 DoDiff(index, false);
\r
662 POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
\r
665 int index = m_cFileList.GetNextSelectedItem(pos);
\r
666 DoDiff(index, true);
\r
672 if (m_cFileList.GetSelectedCount() > 0)
\r
675 CTGitPath savePath;
\r
677 if (!CAppUtils::FileOpenSave(pathSave, NULL, IDS_REPOBROWSE_SAVEAS, IDS_COMMONFILEFILTER, false, m_hWnd))
\r
681 savePath = CTGitPath(pathSave);
\r
683 // now open the selected file for writing
\r
686 CStdioFile file(savePath.GetWinPathString(), CFile::typeBinary | CFile::modeReadWrite | CFile::modeCreate);
\r
687 // temp.Format(IDS_FILEDIFF_CHANGEDLISTINTRO, (LPCTSTR)m_path1.GetGitPathString(), (LPCTSTR)m_rev1.ToString(), (LPCTSTR)m_path2.GetGitPathString(), (LPCTSTR)m_rev2.ToString());
\r
688 file.WriteString(temp + _T("\n"));
\r
689 POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
\r
692 int index = m_cFileList.GetNextSelectedItem(pos);
\r
693 CTGitPath* fd = m_arFilteredList[index];
\r
694 file.WriteString(fd->GetGitPathString());
\r
695 file.WriteString(_T("\n"));
\r
699 catch (CFileException* pE)
\r
708 CopySelectionToClipboard();
\r
713 #if 0 //this funcation seem no useful
\r
714 // export all changed files to a folder
\r
715 CBrowseFolder browseFolder;
\r
716 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
\r
717 if (browseFolder.Show(GetSafeHwnd(), m_strExportDir) == CBrowseFolder::OK)
\r
719 m_arSelectedFileList.RemoveAll();
\r
720 POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
\r
723 int index = m_cFileList.GetNextSelectedItem(pos);
\r
724 CTGitPath* fd = m_arFilteredList[index];
\r
725 m_arSelectedFileList.Add(fd);
\r
727 m_pProgDlg = new CProgressDlg();
\r
728 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
729 if (AfxBeginThread(ExportThreadEntry, this)==NULL)
\r
731 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
732 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
744 UINT CFileDiffDlg::ExportThreadEntry(LPVOID pVoid)
\r
746 return ((CFileDiffDlg*)pVoid)->ExportThread();
\r
749 UINT CFileDiffDlg::ExportThread()
\r
753 // if (m_pProgDlg == NULL)
\r
756 // SetAndClearProgressInfo(m_pProgDlg, false);
\r
757 m_pProgDlg->SetTitle(IDS_PROGRESSWAIT);
\r
758 m_pProgDlg->SetAnimation(AfxGetResourceHandle(), IDR_DOWNLOAD);
\r
759 m_pProgDlg->ShowModeless(this);
\r
760 for (INT_PTR i=0; (i<m_arSelectedFileList.GetCount())&&(!m_pProgDlg->HasUserCancelled()); ++i)
\r
762 CTGitPath* fd = m_arSelectedFileList[i];
\r
763 // CTGitPath url1 = CTGitPath(m_path1.GetGitPathString() + _T("/") + fd.path.GetGitPathString());
\r
764 // CTGitPath url2 = m_bDoPegDiff ? url1 : CTGitPath(m_path2.GetGitPathString() + _T("/") + fd.path.GetGitPathString());
\r
765 // if ((fd.node == svn_node_dir)&&(fd.kind != svn_client_diff_summarize_kind_added))
\r
767 // just create the directory
\r
768 // CreateDirectoryEx(NULL, m_strExportDir+_T("\\")+CPathUtils::PathUnescape(fd.path.GetWinPathString()), NULL);
\r
773 m_pProgDlg->FormatPathLine(1, IDS_PROGRESSGETFILE, (LPCTSTR)url1.GetGitPathString());
\r
775 CTGitPath savepath = CTGitPath(m_strExportDir);
\r
776 savepath.AppendPathString(_T("\\") + CPathUtils::PathUnescape(fd.path.GetWinPathString()));
\r
777 CPathUtils::MakeSureDirectoryPathExists(fd.node == svn_node_file ? savepath.GetContainingDirectory().GetWinPath() : savepath.GetDirectory().GetWinPath());
\r
778 if (fd.node == svn_node_dir)
\r
780 // exporting a folder requires calling Git::Export() so we also export all
\r
781 // children of that added folder.
\r
782 if ((fd.kind == svn_client_diff_summarize_kind_added)&&(!Export(url2, savepath, m_bDoPegDiff ? m_peg : m_rev2, m_rev2, true, true)))
\r
784 if ((!m_bDoPegDiff)||(!Export(url2, savepath, m_rev2, m_rev2, true, true)))
\r
788 CMessageBox::Show(NULL, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
789 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
797 // exporting a file requires calling Git::Cat(), since Git::Export() only works
\r
799 if ((fd.kind != svn_client_diff_summarize_kind_deleted)&&(!Cat(url2, m_bDoPegDiff ? m_peg : m_rev2, m_rev2, savepath)))
\r
801 if ((!m_bDoPegDiff)||(!Cat(url2, m_rev2, m_rev2, savepath)))
\r
805 CMessageBox::Show(NULL, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
\r
806 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
813 m_pProgDlg->SetProgress (count, static_cast<DWORD>(m_arSelectedFileList.GetCount()));
\r
815 m_pProgDlg->Stop();
\r
816 SetAndClearProgressInfo(NULL, false);
\r
819 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
825 BOOL CFileDiffDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
827 if (pWnd != &m_cFileList)
\r
828 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
829 if (m_bThreadRunning == 0)
\r
831 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
833 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
\r
835 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
840 void CFileDiffDlg::OnEnSetfocusFirsturl()
\r
842 GetDlgItem(IDC_FIRSTURL)->HideCaret();
\r
845 void CFileDiffDlg::OnEnSetfocusSecondurl()
\r
847 GetDlgItem(IDC_SECONDURL)->HideCaret();
\r
851 void CFileDiffDlg::OnBnClickedSwitchleftright()
\r
854 if (m_bThreadRunning)
\r
856 CString sFilterString;
\r
857 m_cFilter.GetWindowText(sFilterString);
\r
859 m_cFileList.SetRedraw(false);
\r
860 m_cFileList.DeleteAllItems();
\r
861 for (int i=0; i<(int)m_arFileList.GetCount(); ++i)
\r
863 CTGitPath fd = m_arFileList[i];
\r
864 if (fd.m_Action == CTGitPath::LOGACTIONS_ADDED)
\r
865 fd.m_Action = CTGitPath::LOGACTIONS_DELETED;
\r
866 else if (fd.m_Action == CTGitPath::LOGACTIONS_DELETED)
\r
867 fd.m_Action = CTGitPath::LOGACTIONS_ADDED;
\r
868 ( CTGitPath)m_arFileList[i] = ( CTGitPath)fd;
\r
870 Filter(sFilterString);
\r
872 m_cFileList.SetRedraw(true);
\r
873 CTGitPath path = m_path1;
\r
876 GitRev rev = m_rev1;
\r
883 void CFileDiffDlg::SetURLLabels()
\r
886 m_cRev1Btn.SetWindowText(m_rev1.m_CommitHash.Left(6));
\r
887 m_cRev2Btn.SetWindowText(m_rev2.m_CommitHash.Left(6));
\r
889 SetDlgItemText(IDC_FIRSTURL, m_rev1.m_Subject+CString(_T("\r\n"))+m_rev1.m_CommitHash);
\r
890 SetDlgItemText(IDC_SECONDURL,m_rev2.m_Subject+CString(_T("\r\n"))+m_rev2.m_CommitHash);
\r
892 m_tooltips.AddTool(IDC_FIRSTURL,
\r
893 CAppUtils::FormatDateAndTime( m_rev1.m_AuthorDate, DATE_SHORTDATE, false )+_T(" ")+m_rev1.m_AuthorName);
\r
894 m_tooltips.AddTool(IDC_SECONDURL,
\r
895 CAppUtils::FormatDateAndTime( m_rev2.m_AuthorDate, DATE_SHORTDATE, false )+_T(" ")+m_rev2.m_AuthorName);
\r
899 BOOL CFileDiffDlg::PreTranslateMessage(MSG* pMsg)
\r
901 m_tooltips.RelayEvent(pMsg);
\r
902 if (pMsg->message == WM_KEYDOWN)
\r
904 switch (pMsg->wParam)
\r
908 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
910 // select all entries
\r
911 for (int i=0; i<m_cFileList.GetItemCount(); ++i)
\r
913 m_cFileList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
922 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
924 CopySelectionToClipboard();
\r
931 if (GetFocus() == GetDlgItem(IDC_FILELIST))
\r
933 // Return pressed in file list. Show diff, as for double click
\r
934 int selIndex = m_cFileList.GetSelectionMark();
\r
935 if ((selIndex >= 0) && (selIndex < (int)m_arFileList.GetCount()))
\r
936 DoDiff(selIndex, m_bBlame);
\r
943 return __super::PreTranslateMessage(pMsg);
\r
946 void CFileDiffDlg::OnCancel()
\r
948 if (m_bThreadRunning)
\r
950 m_bCancelled = true;
\r
953 __super::OnCancel();
\r
956 void CFileDiffDlg::OnHdnItemclickFilelist(NMHDR *pNMHDR, LRESULT *pResult)
\r
958 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
959 if (m_bThreadRunning)
\r
962 if (m_nSortedColumn == phdr->iItem)
\r
963 m_bAscending = !m_bAscending;
\r
965 m_bAscending = TRUE;
\r
966 m_nSortedColumn = phdr->iItem;
\r
967 m_arSelectedFileList.RemoveAll();
\r
971 m_cFileList.SetRedraw(FALSE);
\r
972 m_cFileList.DeleteAllItems();
\r
973 m_cFilter.GetWindowText(temp);
\r
976 CHeaderCtrl * pHeader = m_cFileList.GetHeaderCtrl();
\r
977 HDITEM HeaderItem = {0};
\r
978 HeaderItem.mask = HDI_FORMAT;
\r
979 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
981 pHeader->GetItem(i, &HeaderItem);
\r
982 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
983 pHeader->SetItem(i, &HeaderItem);
\r
985 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
986 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
987 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
989 m_cFileList.SetRedraw(TRUE);
\r
994 void CFileDiffDlg::Sort()
\r
996 if(m_arFileList.GetCount() < 2)
\r
1001 // std::sort(m_arFileList.begin(), m_arFileList.end(), &CFileDiffDlg::SortCompare);
\r
1004 bool CFileDiffDlg::SortCompare(const CTGitPath*& Data1, const CTGitPath*& Data2)
\r
1007 switch (m_nSortedColumn)
\r
1009 case 0: //path column
\r
1010 result = Data1.path.GetWinPathString().Compare(Data2.path.GetWinPathString());
\r
1012 case 1: //action column
\r
1013 result = Data1.kind - Data2.kind;
\r
1019 if (!m_bAscending)
\r
1021 return result < 0;
\r
1025 void CFileDiffDlg::OnBnClickedRev1btn()
\r
1028 if (m_bThreadRunning)
\r
1029 return; // do nothing as long as the thread is still running
\r
1031 // show a dialog where the user can enter a revision
\r
1032 CRevisionDlg dlg(this);
\r
1033 dlg.AllowWCRevs(false);
\r
1034 *((GitRev*)&dlg) = m_rev1;
\r
1036 if (dlg.DoModal() == IDOK)
\r
1039 m_cRev1Btn.SetWindowText(m_rev1.ToString());
\r
1040 m_cFileList.DeleteAllItems();
\r
1041 // start a new thread to re-fetch the diff
\r
1042 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
1043 if (AfxBeginThread(DiffThreadEntry, this)==NULL)
\r
1045 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
1046 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
1052 void CFileDiffDlg::OnBnClickedRev2btn()
\r
1055 if (m_bThreadRunning)
\r
1056 return; // do nothing as long as the thread is still running
\r
1058 // show a dialog where the user can enter a revision
\r
1059 CRevisionDlg dlg(this);
\r
1060 dlg.AllowWCRevs(false);
\r
1061 *((GitRev*)&dlg) = m_rev2;
\r
1063 if (dlg.DoModal() == IDOK)
\r
1066 m_cRev2Btn.SetWindowText(m_rev2.ToString());
\r
1067 m_cFileList.DeleteAllItems();
\r
1068 // start a new thread to re-fetch the diff
\r
1069 InterlockedExchange(&m_bThreadRunning, TRUE);
\r
1070 if (AfxBeginThread(DiffThreadEntry, this)==NULL)
\r
1072 InterlockedExchange(&m_bThreadRunning, FALSE);
\r
1073 CMessageBox::Show(NULL, IDS_ERR_THREADSTARTFAILED, IDS_APPNAME, MB_OK | MB_ICONERROR);
\r
1079 LRESULT CFileDiffDlg::OnClickedCancelFilter(WPARAM /*wParam*/, LPARAM /*lParam*/)
\r
1081 if (m_bThreadRunning)
\r
1083 SetTimer(IDT_FILTER, 1000, NULL);
\r
1087 KillTimer(IDT_FILTER);
\r
1089 m_cFileList.SetRedraw(FALSE);
\r
1090 m_arFilteredList.clear();
\r
1091 m_cFileList.DeleteAllItems();
\r
1095 m_cFileList.SetRedraw(TRUE);
\r
1099 void CFileDiffDlg::OnEnChangeFilter()
\r
1101 SetTimer(IDT_FILTER, 1000, NULL);
\r
1104 void CFileDiffDlg::OnTimer(UINT_PTR nIDEvent)
\r
1106 if (m_bThreadRunning)
\r
1109 CString sFilterText;
\r
1110 KillTimer(IDT_FILTER);
\r
1111 m_cFilter.GetWindowText(sFilterText);
\r
1113 m_cFileList.SetRedraw(FALSE);
\r
1114 m_cFileList.DeleteAllItems();
\r
1116 Filter(sFilterText);
\r
1118 m_cFileList.SetRedraw(TRUE);
\r
1120 __super::OnTimer(nIDEvent);
\r
1123 void CFileDiffDlg::Filter(CString sFilterText)
\r
1126 sFilterText.MakeLower();
\r
1128 m_arFilteredList.clear();
\r
1130 for (int i=0;i<m_arFileList.GetCount();i++)
\r
1132 CString sPath = m_arFileList[i].GetGitPathString();
\r
1133 sPath.MakeLower();
\r
1134 if (sPath.Find(sFilterText) >= 0)
\r
1136 m_arFilteredList.push_back((CTGitPath*)&(m_arFileList[i]));
\r
1139 for (std::vector<CTGitPath*>::const_iterator it = m_arFilteredList.begin(); it != m_arFilteredList.end(); ++it)
\r
1146 void CFileDiffDlg::CopySelectionToClipboard()
\r
1148 // copy all selected paths to the clipboard
\r
1149 POSITION pos = m_cFileList.GetFirstSelectedItemPosition();
\r
1151 CString sTextForClipboard;
\r
1152 while ((index = m_cFileList.GetNextSelectedItem(pos)) >= 0)
\r
1154 sTextForClipboard += m_cFileList.GetItemText(index, 0);
\r
1155 sTextForClipboard += _T("\t");
\r
1156 sTextForClipboard += m_cFileList.GetItemText(index, 1);
\r
1157 sTextForClipboard += _T("\r\n");
\r
1159 CStringUtils::WriteAsciiStringToClipboard(sTextForClipboard);
\r