1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2013 - TortoiseGit
4 // Copyright (C) 2003-2008 - TortoiseSVN
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21 #include "TortoiseProc.h"
22 #include "UnicodeUtils.h"
23 #include "MessageBox.h"
26 #include "SysImageList.h"
28 //#include "GitProperties.h"
29 #include "StringUtils.h"
30 #include "PathUtils.h"
31 #include "BrowseFolder.h"
32 #include ".\filediffdlg.h"
34 #include "LoglistCommonResource.h"
35 #include "LoglistUtils.h"
36 #include "BrowseRefsDlg.h"
38 #include "RefLogDlg.h"
39 #include "GitStatusListCtrl.h"
40 #include "FormatMessageWrapper.h"
46 #define ID_CLIPBOARD_PATH 5
47 #define ID_CLIPBOARD_ALL 6
49 #define ID_GNUDIFFCOMPARE 8
53 BOOL
CFileDiffDlg::m_bAscending
= FALSE
;
54 int CFileDiffDlg::m_nSortedColumn
= -1;
57 IMPLEMENT_DYNAMIC(CFileDiffDlg
, CResizableStandAloneDialog
)
58 CFileDiffDlg::CFileDiffDlg(CWnd
* pParent
/*=NULL*/)
59 : CResizableStandAloneDialog(CFileDiffDlg::IDD
, pParent
),
67 CFileDiffDlg::~CFileDiffDlg()
71 void CFileDiffDlg::DoDataExchange(CDataExchange
* pDX
)
73 CResizableStandAloneDialog::DoDataExchange(pDX
);
74 DDX_Control(pDX
, IDC_FILELIST
, m_cFileList
);
75 DDX_Control(pDX
, IDC_SWITCHLEFTRIGHT
, m_SwitchButton
);
76 DDX_Control(pDX
, IDC_REV1BTN
, m_cRev1Btn
);
77 DDX_Control(pDX
, IDC_REV2BTN
, m_cRev2Btn
);
78 DDX_Control(pDX
, IDC_FILTER
, m_cFilter
);
79 DDX_Control(pDX
, IDC_REV1EDIT
, m_ctrRev1Edit
);
80 DDX_Control(pDX
, IDC_REV2EDIT
, m_ctrRev2Edit
);
84 BEGIN_MESSAGE_MAP(CFileDiffDlg
, CResizableStandAloneDialog
)
85 ON_NOTIFY(NM_DBLCLK
, IDC_FILELIST
, OnNMDblclkFilelist
)
86 ON_NOTIFY(LVN_GETINFOTIP
, IDC_FILELIST
, OnLvnGetInfoTipFilelist
)
87 ON_NOTIFY(NM_CUSTOMDRAW
, IDC_FILELIST
, OnNMCustomdrawFilelist
)
90 ON_EN_SETFOCUS(IDC_SECONDURL
, &CFileDiffDlg::OnEnSetfocusSecondurl
)
91 ON_EN_SETFOCUS(IDC_FIRSTURL
, &CFileDiffDlg::OnEnSetfocusFirsturl
)
92 ON_BN_CLICKED(IDC_SWITCHLEFTRIGHT
, &CFileDiffDlg::OnBnClickedSwitchleftright
)
93 ON_NOTIFY(HDN_ITEMCLICK
, 0, &CFileDiffDlg::OnHdnItemclickFilelist
)
94 ON_BN_CLICKED(IDC_REV1BTN
, &CFileDiffDlg::OnBnClickedRev1btn
)
95 ON_BN_CLICKED(IDC_REV2BTN
, &CFileDiffDlg::OnBnClickedRev2btn
)
96 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED
, OnClickedCancelFilter
)
97 ON_EN_CHANGE(IDC_FILTER
, &CFileDiffDlg::OnEnChangeFilter
)
99 ON_MESSAGE(ENAC_UPDATE
, &CFileDiffDlg::OnEnUpdate
)
100 ON_MESSAGE(MSG_REF_LOADED
, OnRefLoad
)
104 void CFileDiffDlg::SetDiff(CTGitPath
* path
, GitRev rev1
, GitRev rev2
)
110 m_sFilter
= path
->GetGitPathString();
116 void CFileDiffDlg::SetDiff(CTGitPath
* path
, CString hash1
, CString hash2
)
122 m_sFilter
= path
->GetGitPathString();
127 if(hash1
== GIT_REV_ZERO
)
129 m_rev1
.m_CommitHash
.Empty();
130 m_rev1
.GetSubject() = CString(MAKEINTRESOURCE(IDS_git_DEPTH_WORKING
));
136 m_rev1
.GetCommit(hash1
);
138 catch (const char *msg
)
140 MessageBox(_T("Could not get commit ") + hash1
+ _T("\nlibgit reports:\n") + CString(msg
), _T("TortoiseGit"), MB_ICONERROR
);
146 if(hash2
== GIT_REV_ZERO
)
148 m_rev2
.m_CommitHash
.Empty();
149 m_rev2
.GetSubject() = CString(MAKEINTRESOURCE(IDS_git_DEPTH_WORKING
));
155 m_rev2
.GetCommit(hash2
);
157 catch (const char *msg
)
159 MessageBox(_T("Could not get commit ") + hash2
+ _T("\nlibgit reports:\n") + CString(msg
), _T("TortoiseGit"), MB_ICONERROR
);
164 void CFileDiffDlg::SetDiff(CTGitPath
* path
, GitRev rev1
)
170 m_sFilter
= path
->GetGitPathString();
173 m_rev2
.m_CommitHash
.Empty();
174 m_rev2
.GetSubject() = CString(MAKEINTRESOURCE(IDS_PROC_PREVIOUSVERSION
));
176 //this->GetDlgItem()->EnableWindow(FALSE);
179 BOOL
CFileDiffDlg::OnInitDialog()
181 CResizableStandAloneDialog::OnInitDialog();
184 CString sWindowTitle
;
185 GetWindowText(sWindowTitle
);
186 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, sWindowTitle
);
188 this->m_ctrRev1Edit
.Init();
189 this->m_ctrRev2Edit
.Init();
191 m_tooltips
.Create(this);
192 m_tooltips
.AddTool(IDC_SWITCHLEFTRIGHT
, IDS_FILEDIFF_SWITCHLEFTRIGHT_TT
);
194 m_cFileList
.SetRedraw(false);
195 m_cFileList
.DeleteAllItems();
196 DWORD exStyle
= LVS_EX_FULLROWSELECT
| LVS_EX_DOUBLEBUFFER
| LVS_EX_INFOTIP
;
197 m_cFileList
.SetExtendedStyle(exStyle
);
199 m_nIconFolder
= SYS_IMAGE_LIST().GetDirIconIndex();
200 m_cFileList
.SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL
);
202 m_SwitchButton
.SetImage((HICON
)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_SWITCHLEFTRIGHT
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
203 m_SwitchButton
.Invalidate();
205 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
);
206 m_cFilter
.SetInfoIcon(IDI_FILTEREDIT
);
207 temp
.LoadString(IDS_FILEDIFF_FILTERCUE
);
209 m_cFilter
.SetCueBanner(temp
);
210 if (!m_sFilter
.IsEmpty())
211 m_cFilter
.SetWindowText(m_sFilter
);
213 int c
= ((CHeaderCtrl
*)(m_cFileList
.GetDlgItem(0)))->GetItemCount()-1;
215 m_cFileList
.DeleteColumn(c
--);
217 temp
.LoadString(IDS_FILEDIFF_FILE
);
218 m_cFileList
.InsertColumn(0, temp
);
219 temp
.LoadString(IDS_FILEDIFF_EXT
);
220 m_cFileList
.InsertColumn(1, temp
);
221 temp
.LoadString(IDS_FILEDIFF_ACTION
);
222 m_cFileList
.InsertColumn(2, temp
);
224 temp
.LoadString(IDS_FILEDIFF_STATADD
);
225 m_cFileList
.InsertColumn(3, temp
);
226 temp
.LoadString(IDS_FILEDIFF_STATDEL
);
227 m_cFileList
.InsertColumn(4, temp
);
230 int maxcol
= ((CHeaderCtrl
*)(m_cFileList
.GetDlgItem(0)))->GetItemCount()-1;
232 for (col
= mincol
; col
<= maxcol
; col
++)
234 m_cFileList
.SetColumnWidth(col
,LVSCW_AUTOSIZE_USEHEADER
);
237 m_cFileList
.SetRedraw(true);
239 AddAnchor(IDC_DIFFSTATIC1
, TOP_LEFT
, TOP_RIGHT
);
240 AddAnchor(IDC_SWITCHLEFTRIGHT
, TOP_RIGHT
);
241 AddAnchor(IDC_FIRSTURL
, TOP_LEFT
, TOP_RIGHT
);
242 AddAnchor(IDC_REV1BTN
, TOP_RIGHT
);
243 //AddAnchor(IDC_DIFFSTATIC2, TOP_LEFT, TOP_RIGHT);
244 AddAnchor(IDC_SECONDURL
, TOP_LEFT
, TOP_RIGHT
);
245 AddAnchor(IDC_REV2BTN
, TOP_RIGHT
);
246 AddAnchor(IDC_FILTER
, TOP_LEFT
, TOP_RIGHT
);
247 AddAnchor(IDC_FILELIST
, TOP_LEFT
, BOTTOM_RIGHT
);
248 AddAnchor(IDC_REV1GROUP
,TOP_LEFT
,TOP_RIGHT
);
249 AddAnchor(IDC_REV2GROUP
,TOP_LEFT
,TOP_RIGHT
);
250 AddAnchor(IDC_REV1EDIT
,TOP_LEFT
);
251 AddAnchor(IDC_REV2EDIT
,TOP_LEFT
);
253 EnableSaveRestore(_T("FileDiffDlg"));
255 if(this->m_strRev1
.IsEmpty())
256 this->m_ctrRev1Edit
.SetWindowText(this->m_rev1
.m_CommitHash
.ToString());
259 bool rev1fail
= false;
262 rev1fail
= !!m_rev1
.GetCommit(m_strRev1
);
264 catch (const char *msg
)
267 MessageBox(_T("Could not get commit ") + m_strRev1
+ _T("\nlibgit reports:\n") + CString(msg
), _T("TortoiseGit"), MB_ICONERROR
);
272 msg
.Format(IDS_PROC_REFINVALID
, m_strRev1
);
273 this->m_FileListText
+= msg
;
276 this->m_ctrRev1Edit
.SetWindowText(m_strRev1
);
279 if(this->m_strRev2
.IsEmpty())
280 this->m_ctrRev2Edit
.SetWindowText(this->m_rev2
.m_CommitHash
.ToString());
283 bool rev2fail
= false;
286 rev2fail
= !!m_rev2
.GetCommit(m_strRev2
);
288 catch (const char *msg
)
291 MessageBox(_T("Could not get commit ") + m_strRev2
+ _T("\nlibgit reports:\n") + CString(msg
), _T("TortoiseGit"), MB_ICONERROR
);
296 msg
.Format(IDS_PROC_REFINVALID
, m_strRev2
);
297 this->m_FileListText
+= msg
;
300 this->m_ctrRev2Edit
.SetWindowText(m_strRev2
);
305 InterlockedExchange(&m_bThreadRunning
, TRUE
);
306 if (AfxBeginThread(DiffThreadEntry
, this)==NULL
)
308 InterlockedExchange(&m_bThreadRunning
, FALSE
);
309 CMessageBox::Show(NULL
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
312 InterlockedExchange(&m_bLoadingRef
, TRUE
);
313 if (AfxBeginThread(LoadRefThreadEntry
, this)==NULL
)
315 InterlockedExchange(&m_bLoadingRef
, FALSE
);
316 CMessageBox::Show(NULL
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
319 this->m_cRev1Btn
.AddEntry(CString(MAKEINTRESOURCE(IDS_REFBROWSE
)));
320 this->m_cRev1Btn
.AddEntry(CString(MAKEINTRESOURCE(IDS_LOG
)));
321 this->m_cRev1Btn
.AddEntry(CString(MAKEINTRESOURCE(IDS_REFLOG
)));
323 this->m_cRev2Btn
.AddEntry(CString(MAKEINTRESOURCE(IDS_REFBROWSE
)));
324 this->m_cRev2Btn
.AddEntry(CString(MAKEINTRESOURCE(IDS_LOG
)));
325 this->m_cRev2Btn
.AddEntry(CString(MAKEINTRESOURCE(IDS_REFLOG
)));
327 // Start with focus on file list
328 GetDlgItem(IDC_FILELIST
)->SetFocus();
330 if(m_rev2
.m_CommitHash
.IsEmpty())
331 m_SwitchButton
.EnableWindow(FALSE
);
333 KillTimer(IDT_INPUT
);
338 svn_error_t
* CFileDiffDlg::DiffSummarizeCallback(const CTGitPath
& path
,
339 svn_client_diff_summarize_kind_t kind
,
340 bool propchanged
, svn_node_kind_t node
)
346 fd
.propchanged
= propchanged
;
347 m_arFileList
.push_back(fd
);
352 UINT
CFileDiffDlg::DiffThreadEntry(LPVOID pVoid
)
354 return ((CFileDiffDlg
*)pVoid
)->DiffThread();
357 UINT
CFileDiffDlg::DiffThread()
360 m_cFileList
.ShowText(CString(MAKEINTRESOURCE(IDS_FILEDIFF_WAIT
)));
361 m_cFileList
.DeleteAllItems();
362 m_arFileList
.Clear();
363 EnableInputControl(false);
365 bool bSuccess
= true;
368 // bSuccess = DiffSummarizePeg(m_path1, m_peg, m_rev1, m_rev2, m_depth, m_bIgnoreancestry);
372 // bSuccess = DiffSummarize(m_path1, m_rev1, m_path2, m_rev2, m_depth, m_bIgnoreancestry);
376 // m_cFileList.ShowText(GetLastErrorMessage());
377 // InterlockedExchange(&m_bThreadRunning, FALSE);
382 if( m_rev1
.m_CommitHash
.IsEmpty() || m_rev2
.m_CommitHash
.IsEmpty())
383 g_Git
.RefreshGitIndex();
385 g_Git
.GetCommitDiffList(m_rev1
.m_CommitHash
.ToString(),m_rev2
.m_CommitHash
.ToString(),m_arFileList
);
388 m_cFilter
.GetWindowText(sFilterText
);
389 m_cFileList
.SetRedraw(false);
391 if (m_arFileList
.GetCount()>0)
393 // Highlight first entry in file list
394 m_cFileList
.SetSelectionMark(0);
395 m_cFileList
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
399 int maxcol
= ((CHeaderCtrl
*)(m_cFileList
.GetDlgItem(0)))->GetItemCount()-1;
401 for (col
= mincol
; col
<= maxcol
; col
++)
403 m_cFileList
.SetColumnWidth(col
,LVSCW_AUTOSIZE_USEHEADER
);
406 m_cFileList
.ClearText();
407 m_cFileList
.SetRedraw(true);
409 InterlockedExchange(&m_bThreadRunning
, FALSE
);
410 InvalidateRect(NULL
);
412 EnableInputControl(true);
416 int CFileDiffDlg::AddEntry(const CTGitPath
* fd
)
421 int index
= m_cFileList
.GetItemCount();
424 if (fd
->IsDirectory())
425 icon_idx
= m_nIconFolder
;
427 icon_idx
= SYS_IMAGE_LIST().GetPathIconIndex(fd
->GetGitPathString());
429 ret
= m_cFileList
.InsertItem(index
, fd
->GetGitPathString(), icon_idx
);
430 m_cFileList
.SetItemText(index
, 1, ((CTGitPath
*)fd
)->GetFileExtension());
431 m_cFileList
.SetItemText(index
, 2, ((CTGitPath
*)fd
)->GetActionName());
432 m_cFileList
.SetItemText(index
, 3, ((CTGitPath
*)fd
)->m_StatAdd
);
433 m_cFileList
.SetItemText(index
, 4, ((CTGitPath
*)fd
)->m_StatDel
);
438 void CFileDiffDlg::EnableInputControl(bool b
)
440 this->m_ctrRev1Edit
.EnableWindow(b
);
441 this->m_ctrRev2Edit
.EnableWindow(b
);
442 this->m_cRev1Btn
.EnableWindow(b
);
443 this->m_cRev2Btn
.EnableWindow(b
);
444 m_cFilter
.EnableWindow(b
);
445 m_SwitchButton
.EnableWindow(b
);
448 void CFileDiffDlg::DoDiff(int selIndex
, bool blame
)
451 CTGitPath
* fd2
= m_arFilteredList
[selIndex
];
452 CTGitPath
* fd1
= fd2
;
453 if (fd2
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
454 fd1
= new CTGitPath(fd2
->GetGitOldPathString());
455 diff
.Diff(fd2
, fd1
, this->m_rev1
.m_CommitHash
.ToString(), this->m_rev2
.m_CommitHash
.ToString(), blame
, FALSE
);
459 void CFileDiffDlg::OnNMDblclkFilelist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
462 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
463 int selIndex
= pNMLV
->iItem
;
466 if (selIndex
>= (int)m_arFilteredList
.size())
469 DoDiff(selIndex
, m_bBlame
);
472 void CFileDiffDlg::OnLvnGetInfoTipFilelist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
475 LPNMLVGETINFOTIP pGetInfoTip
= reinterpret_cast<LPNMLVGETINFOTIP
>(pNMHDR
);
476 if (pGetInfoTip
->iItem
>= (int)m_arFilteredList
.size())
479 CString path
= m_path1
.GetGitPathString() + _T("/") + m_arFilteredList
[pGetInfoTip
->iItem
]->GetGitPathString();
480 if (pGetInfoTip
->cchTextMax
> path
.GetLength())
481 _tcsncpy_s(pGetInfoTip
->pszText
, pGetInfoTip
->cchTextMax
, path
, pGetInfoTip
->cchTextMax
);
486 void CFileDiffDlg::OnNMCustomdrawFilelist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
488 NMLVCUSTOMDRAW
* pLVCD
= reinterpret_cast<NMLVCUSTOMDRAW
*>( pNMHDR
);
489 // Take the default processing unless we set this to something else below.
490 *pResult
= CDRF_DODEFAULT
;
492 // First thing - check the draw stage. If it's the control's prepaint
493 // stage, then tell Windows we want messages for every item.
495 if ( CDDS_PREPAINT
== pLVCD
->nmcd
.dwDrawStage
)
497 *pResult
= CDRF_NOTIFYITEMDRAW
;
499 else if ( CDDS_ITEMPREPAINT
== pLVCD
->nmcd
.dwDrawStage
)
501 // This is the prepaint stage for an item. Here's where we set the
502 // item's text color. Our return value will tell Windows to draw the
503 // item itself, but it will use the new color we set here.
505 // Tell Windows to paint the control itself.
506 *pResult
= CDRF_DODEFAULT
;
508 COLORREF crText
= GetSysColor(COLOR_WINDOWTEXT
);
510 if (m_arFilteredList
.size() > pLVCD
->nmcd
.dwItemSpec
)
512 CTGitPath
* fd
= m_arFilteredList
[pLVCD
->nmcd
.dwItemSpec
];
513 switch (fd
->m_Action
)
515 case CTGitPath::LOGACTIONS_ADDED
:
516 crText
= m_colors
.GetColor(CColors::Added
);
518 case CTGitPath::LOGACTIONS_DELETED
:
519 crText
= m_colors
.GetColor(CColors::Deleted
);
521 case CTGitPath::LOGACTIONS_MODIFIED
:
522 crText
= m_colors
.GetColor(CColors::Modified
);
524 //case svn_client_diff_summarize_kind_normal:
526 //if (fd.propchanged)
527 crText
= m_colors
.GetColor(CColors::PropertyChanged
);
531 // Store the color back in the NMLVCUSTOMDRAW struct.
532 pLVCD
->clrText
= crText
;
536 UINT
CFileDiffDlg::LoadRefThread()
538 g_Git
.GetBranchList(m_Reflist
,NULL
,CGit::BRANCH_ALL_F
);
539 g_Git
.GetTagList(m_Reflist
);
541 this->PostMessage(MSG_REF_LOADED
);
542 InterlockedExchange(&m_bLoadingRef
, FALSE
);
546 void CFileDiffDlg::OnContextMenu(CWnd
* pWnd
, CPoint point
)
548 if ((pWnd
==0)||(pWnd
!= &m_cFileList
))
550 if (m_cFileList
.GetSelectedCount() == 0)
552 // if the context menu is invoked through the keyboard, we have to use
553 // a calculated position on where to anchor the menu on
554 if ((point
.x
== -1) && (point
.y
== -1))
557 m_cFileList
.GetItemRect(m_cFileList
.GetSelectionMark(), &rect
, LVIR_LABEL
);
558 m_cFileList
.ClientToScreen(&rect
);
559 point
= rect
.CenterPoint();
562 if (popup
.CreatePopupMenu())
565 popup
.AppendMenuIcon(ID_COMPARE
, IDS_LOG_POPUP_COMPARETWO
, IDI_DIFF
);
566 popup
.AppendMenuIcon(ID_GNUDIFFCOMPARE
, IDS_LOG_POPUP_GNUDIFF
, IDI_DIFF
);
567 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
568 menuText
.Format(IDS_FILEDIFF_POPREVERTTOREV
, m_rev1
.m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()));
569 popup
.AppendMenuIcon(ID_REVERT1
, menuText
, IDI_REVERT
);
570 menuText
.Format(IDS_FILEDIFF_POPREVERTTOREV
, m_rev2
.m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()));
571 popup
.AppendMenuIcon(ID_REVERT2
, menuText
, IDI_REVERT
);
572 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
573 popup
.AppendMenuIcon(ID_LOG
, IDS_FILEDIFF_LOG
, IDI_LOG
);
574 popup
.AppendMenuIcon(ID_BLAME
, IDS_FILEDIFF_POPBLAME
, IDI_BLAME
);
575 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
576 popup
.AppendMenuIcon(ID_EXPORT
, IDS_FILEDIFF_POPEXPORT
, IDI_EXPORT
);
577 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
578 popup
.AppendMenuIcon(ID_SAVEAS
, IDS_FILEDIFF_POPSAVELIST
, IDI_SAVEAS
);
579 popup
.AppendMenuIcon(ID_CLIPBOARD_PATH
, IDS_STATUSLIST_CONTEXT_COPY
, IDI_COPYCLIP
);
580 popup
.AppendMenuIcon(ID_CLIPBOARD_ALL
, IDS_STATUSLIST_CONTEXT_COPYEXT
, IDI_COPYCLIP
);
582 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
583 m_bCancelled
= false;
588 POSITION pos
= m_cFileList
.GetFirstSelectedItemPosition();
591 int index
= m_cFileList
.GetNextSelectedItem(pos
);
592 DoDiff(index
, false);
596 case ID_GNUDIFFCOMPARE
:
598 POSITION pos
= m_cFileList
.GetFirstSelectedItemPosition();
601 CTGitPath
*fd2
= m_arFilteredList
[m_cFileList
.GetNextSelectedItem(pos
)];
602 CTGitPath
*fd1
= fd2
;
603 if (fd2
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
604 fd1
= new CTGitPath(fd2
->GetGitOldPathString());
605 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *fd2
, m_rev2
.m_CommitHash
.ToString(), *fd1
, m_rev1
.m_CommitHash
.ToString());
610 RevertSelectedItemToVersion(m_rev1
.m_CommitHash
.ToString());
613 RevertSelectedItemToVersion(m_rev2
.m_CommitHash
.ToString());
617 POSITION pos
= m_cFileList
.GetFirstSelectedItemPosition();
620 int index
= m_cFileList
.GetNextSelectedItem(pos
);
621 CAppUtils::LaunchTortoiseBlame(m_arFilteredList
[index
]->GetWinPathString(), m_rev1
.m_CommitHash
.ToString());
627 POSITION pos
= m_cFileList
.GetFirstSelectedItemPosition();
630 int index
= m_cFileList
.GetNextSelectedItem(pos
);
631 CString cmd
= _T("/command:log");
632 cmd
+= _T(" /path:\"")+m_arFilteredList
[index
]->GetWinPathString()+_T("\" ");
633 cmd
+= _T(" /endrev:")+m_rev1
.m_CommitHash
.ToString();
634 CAppUtils::RunTortoiseGitProc(cmd
);
640 if (m_cFileList
.GetSelectedCount() > 0)
645 if (!CAppUtils::FileOpenSave(pathSave
, NULL
, IDS_REPOBROWSE_SAVEAS
, IDS_COMMONFILEFILTER
, false, m_hWnd
))
649 savePath
= CTGitPath(pathSave
);
651 // now open the selected file for writing
654 CStdioFile
file(savePath
.GetWinPathString(), CFile::typeBinary
| CFile::modeReadWrite
| CFile::modeCreate
);
655 // temp.Format(IDS_FILEDIFF_CHANGEDLISTINTRO, (LPCTSTR)m_path1.GetGitPathString(), (LPCTSTR)m_rev1.ToString(), (LPCTSTR)m_path2.GetGitPathString(), (LPCTSTR)m_rev2.ToString());
656 file
.WriteString(temp
+ _T("\n"));
657 POSITION pos
= m_cFileList
.GetFirstSelectedItemPosition();
660 int index
= m_cFileList
.GetNextSelectedItem(pos
);
661 CTGitPath
* fd
= m_arFilteredList
[index
];
662 file
.WriteString(fd
->GetGitPathString());
663 file
.WriteString(_T("\n"));
667 catch (CFileException
* pE
)
674 case ID_CLIPBOARD_PATH
:
676 CopySelectionToClipboard();
680 case ID_CLIPBOARD_ALL
:
682 CopySelectionToClipboard(TRUE
);
687 // export all changed files to a folder
688 CBrowseFolder browseFolder
;
689 browseFolder
.m_style
= BIF_EDITBOX
| BIF_NEWDIALOGSTYLE
| BIF_RETURNFSANCESTORS
| BIF_RETURNONLYFSDIRS
;
690 if (browseFolder
.Show(GetSafeHwnd(), m_strExportDir
) == CBrowseFolder::OK
)
692 POSITION pos
= m_cFileList
.GetFirstSelectedItemPosition();
695 int index
= m_cFileList
.GetNextSelectedItem(pos
);
696 CTGitPath
* fd
= m_arFilteredList
[index
];
697 // we cannot export directories or folders
698 if (fd
->m_Action
== CTGitPath::LOGACTIONS_DELETED
|| fd
->IsDirectory())
700 CAppUtils::CreateMultipleDirectory(m_strExportDir
+ _T("\\") + fd
->GetDirectory().GetWinPathString());
701 CString filename
= m_strExportDir
+ _T("\\") + fd
->GetWinPathString();
702 if(m_rev1
.m_CommitHash
.ToString() == GIT_REV_ZERO
)
704 if(!CopyFile(g_Git
.m_CurrentDir
+ _T("\\") + fd
->GetWinPath(), filename
, false))
706 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
712 if(g_Git
.GetOneFile(m_rev1
.m_CommitHash
, *fd
, filename
))
715 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, fd
->GetGitPathString(), m_rev1
.m_CommitHash
.ToString(), filename
);
716 if (CMessageBox::Show(NULL
, out
, _T("TortoiseGit"), 2, IDI_WARNING
, CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON
)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON
))) == 2)
730 BOOL
CFileDiffDlg::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
732 if (pWnd
!= &m_cFileList
)
733 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
734 if (m_bThreadRunning
== 0)
736 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_ARROW
));
738 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
740 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_WAIT
));
745 void CFileDiffDlg::OnEnSetfocusFirsturl()
747 GetDlgItem(IDC_FIRSTURL
)->HideCaret();
750 void CFileDiffDlg::OnEnSetfocusSecondurl()
752 GetDlgItem(IDC_SECONDURL
)->HideCaret();
756 void CFileDiffDlg::OnBnClickedSwitchleftright()
759 if (m_bThreadRunning
)
763 CString sFilterString
;
764 m_cFilter
.GetWindowText(sFilterString
);
766 m_cFileList
.SetRedraw(false);
767 m_cFileList
.DeleteAllItems();
768 for (int i
=0; i
<(int)m_arFileList
.GetCount(); ++i
)
770 CTGitPath fd
= m_arFileList
[i
];
771 if (fd
.m_Action
== CTGitPath::LOGACTIONS_ADDED
)
772 fd
.m_Action
= CTGitPath::LOGACTIONS_DELETED
;
773 else if (fd
.m_Action
== CTGitPath::LOGACTIONS_DELETED
)
774 fd
.m_Action
= CTGitPath::LOGACTIONS_ADDED
;
775 std::swap(fd
.m_StatAdd
, fd
.m_StatDel
);
776 (CTGitPath
&)m_arFileList
[i
] = fd
;
778 Filter(sFilterString
);
781 m_cFileList
.SetRedraw(true);
782 CTGitPath path
= m_path1
;
790 this->m_ctrRev1Edit
.GetWindowText(str1
);
791 this->m_ctrRev2Edit
.GetWindowText(str2
);
793 this->m_ctrRev1Edit
.SetWindowText(str2
);
794 this->m_ctrRev2Edit
.SetWindowText(str1
);
797 //KillTimer(IDT_INPUT);
800 void CFileDiffDlg::SetURLLabels(int mask
)
803 // m_cRev1Btn.SetWindowText(m_rev1.m_CommitHash.ToString().Left(6));
804 // m_cRev2Btn.SetWindowText(m_rev2.m_CommitHash.ToString().Left(6));
808 SetDlgItemText(IDC_FIRSTURL
, m_rev1
.m_CommitHash
.ToString().Left(8)+_T(": ")+m_rev1
.GetSubject());
809 m_tooltips
.AddTool(IDC_FIRSTURL
,
810 CLoglistUtils::FormatDateAndTime(m_rev1
.GetAuthorDate(), DATE_SHORTDATE
, false) + _T(" ") + m_rev1
.GetAuthorName());
816 SetDlgItemText(IDC_SECONDURL
,m_rev2
.m_CommitHash
.ToString().Left(8)+_T(": ")+m_rev2
.GetSubject());
818 m_tooltips
.AddTool(IDC_SECONDURL
,
819 CLoglistUtils::FormatDateAndTime(m_rev2
.GetAuthorDate(), DATE_SHORTDATE
, false) + _T(" ") + m_rev2
.GetAuthorName());
822 this->GetDlgItem(IDC_REV2GROUP
)->SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_FILEDIFF_VERSION2BASE
)));
823 this->GetDlgItem(IDC_REV1GROUP
)->SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_FILEDIFF_VERSION1
)));
825 if( (mask
&0x3) == 0x3)
826 if(m_rev2
.GetCommitterDate() > m_rev1
.GetCommitterDate())
828 this->GetDlgItem(IDC_REV2GROUP
)->SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_FILEDIFF_VERSION2BASENEWER
)));
832 this->GetDlgItem(IDC_REV1GROUP
)->SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_FILEDIFF_VERSION1NEWER
)));
836 void CFileDiffDlg::ClearURLabels(int mask
)
840 SetDlgItemText(IDC_FIRSTURL
, _T(""));
841 m_tooltips
.AddTool(IDC_FIRSTURL
, _T(""));
846 SetDlgItemText(IDC_SECONDURL
, _T(""));
847 m_tooltips
.AddTool(IDC_SECONDURL
, _T(""));
850 BOOL
CFileDiffDlg::PreTranslateMessage(MSG
* pMsg
)
852 m_tooltips
.RelayEvent(pMsg
);
853 if (pMsg
->message
== WM_KEYDOWN
)
855 switch (pMsg
->wParam
)
859 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
861 // select all entries
862 for (int i
=0; i
<m_cFileList
.GetItemCount(); ++i
)
864 m_cFileList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
873 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
875 CopySelectionToClipboard();
882 if (GetFocus() == GetDlgItem(IDC_FILELIST
))
884 // Return pressed in file list. Show diff, as for double click
885 int selIndex
= m_cFileList
.GetSelectionMark();
886 if ((selIndex
>= 0) && (selIndex
< (int)m_arFileList
.GetCount()))
887 DoDiff(selIndex
, m_bBlame
);
899 return __super::PreTranslateMessage(pMsg
);
902 void CFileDiffDlg::OnCancel()
904 if (m_bThreadRunning
)
912 void CFileDiffDlg::OnHdnItemclickFilelist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
914 LPNMHEADER phdr
= reinterpret_cast<LPNMHEADER
>(pNMHDR
);
915 if (m_bThreadRunning
)
918 if (m_nSortedColumn
== phdr
->iItem
)
919 m_bAscending
= !m_bAscending
;
922 m_nSortedColumn
= phdr
->iItem
;
926 m_cFileList
.SetRedraw(FALSE
);
927 m_cFileList
.DeleteAllItems();
928 m_cFilter
.GetWindowText(temp
);
931 CHeaderCtrl
* pHeader
= m_cFileList
.GetHeaderCtrl();
932 HDITEM HeaderItem
= {0};
933 HeaderItem
.mask
= HDI_FORMAT
;
934 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
936 pHeader
->GetItem(i
, &HeaderItem
);
937 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
938 pHeader
->SetItem(i
, &HeaderItem
);
940 pHeader
->GetItem(m_nSortedColumn
, &HeaderItem
);
941 HeaderItem
.fmt
|= (m_bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
942 pHeader
->SetItem(m_nSortedColumn
, &HeaderItem
);
944 m_cFileList
.SetRedraw(TRUE
);
949 void CFileDiffDlg::Sort()
951 if(m_arFileList
.GetCount() < 2)
956 std::sort(m_arFileList
.m_paths
.begin(), m_arFileList
.m_paths
.end(), &CFileDiffDlg::SortCompare
);
959 bool CFileDiffDlg::SortCompare(const CTGitPath
& Data1
, const CTGitPath
& Data2
)
963 switch (m_nSortedColumn
)
965 case 0: //path column
966 result
= Data1
.GetWinPathString().Compare(Data2
.GetWinPathString());
968 case 1: //extension column
969 result
= Data1
.GetFileExtension().Compare(Data2
.GetFileExtension());
971 case 2: //action column
972 result
= Data1
.m_Action
- Data2
.m_Action
;
975 d1
= CSorter::A2L(Data1
.m_StatAdd
);
976 d2
= CSorter::A2L(Data2
.m_StatAdd
);
980 d1
= CSorter::A2L(Data1
.m_StatDel
);;
981 d2
= CSorter::A2L(Data2
.m_StatDel
);
987 // sort by path name as second priority
988 if (m_nSortedColumn
!= 0 && result
== 0)
989 result
= Data1
.GetWinPathString().Compare(Data2
.GetWinPathString());
997 void CFileDiffDlg::OnBnClickedRev1btn()
999 ClickRevButton(&this->m_cRev1Btn
,&this->m_rev1
, &this->m_ctrRev1Edit
);
1002 void CFileDiffDlg::ClickRevButton(CMenuButton
*button
, GitRev
*rev
, CACEdit
*edit
)
1004 INT_PTR entry
=button
->GetCurrentEntry();
1005 if(entry
== 0) /* Browse Refence*/
1008 CString str
= CBrowseRefsDlg::PickRef();
1012 if(FillRevFromString(rev
,str
))
1015 edit
->SetWindowText(str
);
1019 if(entry
== 1) /*Log*/
1022 dlg
.SetSelect(true);
1023 if(dlg
.DoModal() == IDOK
)
1025 if( dlg
.GetSelectedHash().IsEmpty() )
1028 if(FillRevFromString(rev
,dlg
.GetSelectedHash()))
1031 edit
->SetWindowText(dlg
.GetSelectedHash());
1038 if(entry
== 2) /*RefLog*/
1041 if(dlg
.DoModal() == IDOK
)
1043 if(FillRevFromString(rev
,dlg
.m_SelectedHash
))
1046 edit
->SetWindowText(dlg
.m_SelectedHash
);
1055 InterlockedExchange(&m_bThreadRunning
, TRUE
);
1056 if (AfxBeginThread(DiffThreadEntry
, this)==NULL
)
1058 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1059 CMessageBox::Show(NULL
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
1061 KillTimer(IDT_INPUT
);
1064 void CFileDiffDlg::OnBnClickedRev2btn()
1066 ClickRevButton(&this->m_cRev2Btn
,&this->m_rev2
, &this->m_ctrRev2Edit
);
1069 LRESULT
CFileDiffDlg::OnClickedCancelFilter(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1071 if (m_bThreadRunning
)
1073 SetTimer(IDT_FILTER
, 1000, NULL
);
1077 KillTimer(IDT_FILTER
);
1079 m_cFileList
.SetRedraw(FALSE
);
1080 m_arFilteredList
.clear();
1081 m_cFileList
.DeleteAllItems();
1085 m_cFileList
.SetRedraw(TRUE
);
1089 void CFileDiffDlg::OnEnChangeFilter()
1091 SetTimer(IDT_FILTER
, 1000, NULL
);
1094 void CFileDiffDlg::OnTimer(UINT_PTR nIDEvent
)
1096 if (m_bThreadRunning
)
1099 if( nIDEvent
== IDT_FILTER
)
1101 CString sFilterText
;
1102 KillTimer(IDT_FILTER
);
1103 m_cFilter
.GetWindowText(sFilterText
);
1105 m_cFileList
.SetRedraw(FALSE
);
1106 m_cFileList
.DeleteAllItems();
1108 Filter(sFilterText
);
1110 m_cFileList
.SetRedraw(TRUE
);
1112 __super::OnTimer(nIDEvent
);
1115 if( nIDEvent
== IDT_INPUT
)
1117 KillTimer(IDT_INPUT
);
1118 TRACE(_T("Input Timer\r\n"));
1123 this->m_ctrRev1Edit
.GetWindowText(str
);
1126 if (!gitrev
.GetCommit(str
))
1132 catch (const char *msg
)
1134 CMessageBox::Show(m_hWnd
, _T("Could not get commit ") + str
+ _T("\nlibgit reports:\n") + CString(msg
), _T("TortoiseGit"), MB_ICONERROR
);
1137 this->m_ctrRev2Edit
.GetWindowText(str
);
1141 if (!gitrev
.GetCommit(str
))
1147 catch (const char *msg
)
1149 CMessageBox::Show(m_hWnd
, _T("Could not get commit ") + str
+ _T("\nlibgit reports:\n") + CString(msg
), _T("TortoiseGit"), MB_ICONERROR
);
1152 this->SetURLLabels(mask
);
1157 InterlockedExchange(&m_bThreadRunning
, TRUE
);
1158 if (AfxBeginThread(DiffThreadEntry
, this)==NULL
)
1160 InterlockedExchange(&m_bThreadRunning
, FALSE
);
1161 CMessageBox::Show(NULL
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
1167 void CFileDiffDlg::Filter(CString sFilterText
)
1169 sFilterText
.MakeLower();
1171 m_arFilteredList
.clear();
1173 for (int i
=0;i
<m_arFileList
.GetCount();i
++)
1175 CString sPath
= m_arFileList
[i
].GetGitPathString();
1177 if (sPath
.Find(sFilterText
) >= 0)
1179 m_arFilteredList
.push_back((CTGitPath
*)&(m_arFileList
[i
]));
1182 for (std::vector
<CTGitPath
*>::const_iterator it
= m_arFilteredList
.begin(); it
!= m_arFilteredList
.end(); ++it
)
1188 void CFileDiffDlg::CopySelectionToClipboard(BOOL isFull
)
1190 // copy all selected paths to the clipboard
1191 POSITION pos
= m_cFileList
.GetFirstSelectedItemPosition();
1193 CString sTextForClipboard
;
1194 while ((index
= m_cFileList
.GetNextSelectedItem(pos
)) >= 0)
1196 sTextForClipboard
+= m_cFileList
.GetItemText(index
, 0);
1197 sTextForClipboard
+= _T("\t");
1201 sTextForClipboard
+= _T("\r\n");
1206 sTextForClipboard
+= m_cFileList
.GetItemText(index
, 1);
1207 sTextForClipboard
+= _T("\t");
1208 sTextForClipboard
+= m_cFileList
.GetItemText(index
, 2);
1209 sTextForClipboard
+= _T("\t");
1210 sTextForClipboard
+= m_cFileList
.GetItemText(index
, 3);
1211 sTextForClipboard
+= _T("\t");
1212 sTextForClipboard
+= m_cFileList
.GetItemText(index
, 4);
1213 sTextForClipboard
+= _T("\r\n");
1216 CStringUtils::WriteAsciiStringToClipboard(sTextForClipboard
);
1220 LRESULT
CFileDiffDlg::OnRefLoad(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1222 for(int i
=0;i
<m_Reflist
.size();i
++)
1224 CString str
=m_Reflist
[i
];
1226 if(str
.Find(_T("remotes/")) == 0)
1229 m_ctrRev1Edit
.AddSearchString(str
);
1230 m_ctrRev2Edit
.AddSearchString(str
);
1235 BOOL
CFileDiffDlg::DestroyWindow()
1237 return CResizableStandAloneDialog::DestroyWindow();
1240 LRESULT
CFileDiffDlg::OnEnUpdate(WPARAM
/*wParam*/, LPARAM lParam
)
1242 if(lParam
== IDC_REV1EDIT
)
1244 OnTextUpdate(&this->m_ctrRev1Edit
);
1247 if(lParam
== IDC_REV2EDIT
)
1249 OnTextUpdate(&this->m_ctrRev2Edit
);
1250 ClearURLabels(1<<1);
1255 void CFileDiffDlg::OnTextUpdate(CACEdit
* /*pEdit*/)
1257 SetTimer(IDT_INPUT
, 1000, NULL
);
1258 this->m_cFileList
.ShowText(_T("Wait For input validate version"));
1261 int CFileDiffDlg::RevertSelectedItemToVersion(CString rev
)
1263 if (rev
.IsEmpty() || rev
== GIT_REV_ZERO
)
1266 POSITION pos
= m_cFileList
.GetFirstSelectedItemPosition();
1269 while ((index
= m_cFileList
.GetNextSelectedItem(pos
)) >= 0)
1272 CTGitPath
*fentry
= (CTGitPath
*)m_arFilteredList
[index
];
1273 cmd
.Format(_T("git.exe checkout %s -- \"%s\""), rev
, fentry
->GetGitPathString());
1274 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
1276 if (CMessageBox::Show(NULL
, out
, _T("TortoiseGit"), 2, IDI_WARNING
, CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON
)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON
))) == 2)
1284 out
.Format(IDS_STATUSLIST_FILESREVERTED
, count
, rev
);
1285 CMessageBox::Show(NULL
, out
, _T("TortoiseGit"), MB_OK
);