1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2008 - TortoiseSVN
4 // Copyright (C) 2008-2013 - TortoiseGit
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"
24 #include "GITProgressDlg.h"
25 #include "ProgressDlg.h"
26 //#include "CopyDlg.h"
27 #include "StatGraphDlg.h"
29 #include "MessageBox.h"
32 #include "PathUtils.h"
33 #include "StringUtils.h"
34 #include "UnicodeUtils.h"
36 //#include "GitInfo.h"
37 //#include "GitDiff.h"
39 //#include "BrowseFolder.h"
40 //#include "GitHelpers.h"
41 #include "GitStatus.h"
42 //#include "LogDlgHelper.h"
43 //#include "CachedLogInfo.h"
44 #include "FileDiffDlg.h"
45 #include "BrowseRefsDlg.h"
46 #include "SmartHandle.h"
48 IMPLEMENT_DYNAMIC(CLogDlg
, CResizableStandAloneDialog
)
49 CLogDlg::CLogDlg(CWnd
* pParent
/*=NULL*/)
50 : CResizableStandAloneDialog(CLogDlg::IDD
, pParent
)
52 , m_currentChangedArray(NULL
)
54 , m_bFollowRenames(FALSE
)
58 , m_bSelectionMustBeContinuous(false)
63 , m_pNotifyWindow(NULL
)
70 m_bFilterWithRegex
= !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE
);
73 str
=g_Git
.m_CurrentDir
;
74 str
.Replace(_T(":"),_T("_"));
75 str
=CString(_T("Software\\TortoiseGit\\LogDialog\\AllBranch\\"))+str
;
77 m_regbAllBranch
=CRegDWORD(str
,FALSE
);
79 m_bAllBranch
=m_regbAllBranch
;
81 str
= g_Git
.m_CurrentDir
;
82 str
.Replace(_T(":"),_T("_"));
83 str
= CString(_T("Software\\TortoiseGit\\LogDialog\\ShowTags\\")) + str
;
84 m_regbShowTags
= CRegDWORD(str
, TRUE
);
85 m_bShowTags
= m_regbShowTags
;
88 m_bWholeProject
=FALSE
;
90 m_bShowUnversioned
= CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE
);
96 m_regbAllBranch
=m_bAllBranch
;
97 m_regbShowTags
= m_bShowTags
;
99 m_CurrentFilteredChangedArray
.RemoveAll();
103 void CLogDlg::DoDataExchange(CDataExchange
* pDX
)
105 CResizableStandAloneDialog::DoDataExchange(pDX
);
106 DDX_Control(pDX
, IDC_LOGLIST
, m_LogList
);
107 DDX_Control(pDX
, IDC_LOGMSG
, m_ChangedFileListCtrl
);
108 DDX_Control(pDX
, IDC_PROGRESS
, m_LogProgress
);
109 DDX_Control(pDX
, IDC_SPLITTERTOP
, m_wndSplitter1
);
110 DDX_Control(pDX
, IDC_SPLITTERBOTTOM
, m_wndSplitter2
);
111 DDX_Text(pDX
, IDC_SEARCHEDIT
, m_LogList
.m_sFilterText
);
112 DDX_Control(pDX
, IDC_DATEFROM
, m_DateFrom
);
113 DDX_Control(pDX
, IDC_DATETO
, m_DateTo
);
114 DDX_Control(pDX
, IDC_LOG_JUMPTYPE
, m_JumpType
);
115 DDX_Control(pDX
, IDC_LOG_JUMPUP
, m_JumpUp
);
116 DDX_Control(pDX
, IDC_LOG_JUMPDOWN
, m_JumpDown
);
117 DDX_Control(pDX
, IDC_HIDEPATHS
, m_cHidePaths
);
118 DDX_Text(pDX
, IDC_LOGINFO
, m_sLogInfo
);
119 DDX_Check(pDX
, IDC_LOG_FIRSTPARENT
, m_bFirstParent
);
120 DDX_Check(pDX
, IDC_LOG_ALLBRANCH
,m_bAllBranch
);
121 DDX_Check(pDX
, IDC_LOG_FOLLOWRENAMES
, m_bFollowRenames
);
122 DDX_Check(pDX
, IDC_SHOWWHOLEPROJECT
,m_bWholeProject
);
123 DDX_Check(pDX
, IDC_LOG_SHOWTAGS
, m_bShowTags
);
124 DDX_Control(pDX
, IDC_SEARCHEDIT
, m_cFilter
);
125 DDX_Control(pDX
, IDC_STATIC_REF
, m_staticRef
);
128 BEGIN_MESSAGE_MAP(CLogDlg
, CResizableStandAloneDialog
)
131 ON_BN_CLICKED(IDHELP
, OnBnClickedHelp
)
132 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGLIST
, OnLvnItemchangedLoglist
)
133 ON_NOTIFY(EN_LINK
, IDC_MSGVIEW
, OnEnLinkMsgview
)
134 ON_BN_CLICKED(IDC_STATBUTTON
, OnBnClickedStatbutton
)
136 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED
, OnClickedInfoIcon
)
137 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED
, OnClickedCancelFilter
)
139 ON_MESSAGE(MSG_LOAD_PERCENTAGE
,OnLogListLoading
)
141 ON_EN_CHANGE(IDC_SEARCHEDIT
, OnEnChangeSearchedit
)
143 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATETO
, OnDtnDatetimechangeDateto
)
144 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATEFROM
, OnDtnDatetimechangeDatefrom
)
145 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE
, &CLogDlg::OnCbnSelchangeJumpType
)
146 ON_COMMAND(IDC_LOG_JUMPUP
, &CLogDlg::OnBnClickedJumpUp
)
147 ON_COMMAND(IDC_LOG_JUMPDOWN
, &CLogDlg::OnBnClickedJumpDown
)
148 ON_BN_CLICKED(IDC_SHOWWHOLEPROJECT
, OnBnClickShowWholeProject
)
149 ON_NOTIFY(LVN_COLUMNCLICK
,IDC_LOGLIST
, OnLvnColumnclick
)
150 ON_BN_CLICKED(IDC_HIDEPATHS
, OnBnClickedHidepaths
)
151 ON_COMMAND(MSG_FETCHED_DIFF
, OnBnClickedHidepaths
)
152 ON_BN_CLICKED(IDC_LOG_ALLBRANCH
, OnBnClickedAllBranch
)
153 ON_BN_CLICKED(IDC_LOG_FOLLOWRENAMES
, OnBnClickedFollowRenames
)
154 ON_BN_CLICKED(IDC_LOG_SHOWTAGS
, OnBnClickedShowTags
)
156 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATEFROM
, &CLogDlg::OnDtnDropdownDatefrom
)
157 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATETO
, &CLogDlg::OnDtnDropdownDateto
)
159 ON_BN_CLICKED(IDC_LOG_FIRSTPARENT
, &CLogDlg::OnBnClickedFirstParent
)
160 ON_BN_CLICKED(IDC_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
161 ON_STN_CLICKED(IDC_STATIC_REF
, &CLogDlg::OnBnClickedBrowseRef
)
162 ON_COMMAND(ID_LOGDLG_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
163 ON_COMMAND(ID_LOGDLG_FIND
, &CLogDlg::OnFind
)
164 ON_COMMAND(ID_LOGDLG_FOCUSFILTER
, &CLogDlg::OnFocusFilter
)
165 ON_COMMAND(ID_EDIT_COPY
, &CLogDlg::OnEditCopy
)
166 ON_MESSAGE(MSG_REFLOG_CHANGED
, OnRefLogChanged
)
167 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
172 JumpType_AuthorEmail
,
173 JumpType_CommitterEmail
,
181 void CLogDlg::SetParams(const CTGitPath
& orgPath
, const CTGitPath
& path
, CString hightlightRevision
, CString startrev
, CString endrev
, int limit
/* = FALSE */)
185 m_hightlightRevision
= hightlightRevision
;
187 if (startrev
== GIT_REV_ZERO
)
189 if (endrev
== GIT_REV_ZERO
)
192 this->m_LogList
.m_startrev
= startrev
;
193 m_LogRevision
= startrev
;
194 this->m_LogList
.m_endrev
= endrev
;
196 if(!endrev
.IsEmpty())
197 this->SetStartRef(endrev
);
200 if (::IsWindow(m_hWnd
))
204 void CLogDlg::SetFilter(const CString
& findstr
, LONG findtype
, bool findregex
)
206 m_LogList
.m_sFilterText
= findstr
;
208 m_LogList
.m_SelectedFilters
= findtype
;
209 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
= findregex
;
212 BOOL
CLogDlg::OnInitDialog()
215 CResizableStandAloneDialog::OnInitDialog();
216 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
218 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
219 // do this, Explorer would be unable to send that message to our window if we
220 // were running elevated. It's OK to make the call all the time, since if we're
221 // not elevated, this is a no-op.
222 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
223 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
224 CAutoLibrary hUser
= AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
227 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
228 if (pfnChangeWindowMessageFilterEx
)
230 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
233 m_pTaskbarList
.Release();
234 if (FAILED(m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
)))
235 m_pTaskbarList
= nullptr;
237 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG
));
239 // use the state of the "stop on copy/rename" option from the last time
242 // set the font to use in the log message view, configured in the settings dialog
243 CAppUtils::CreateFontForLogs(m_logFont
);
244 GetDlgItem(IDC_MSGVIEW
)->SetFont(&m_logFont
);
245 // automatically detect URLs in the log message and turn them into links
246 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_AUTOURLDETECT
, TRUE
, NULL
);
247 // make the log message rich edit control send a message when the mouse pointer is over a link
248 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_SETEVENTMASK
, NULL
, ENM_LINK
);
249 //m_LogList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER | LVS_EX_SUBITEMIMAGES);
251 // the "hide unrelated paths" checkbox should be indeterminate
252 m_cHidePaths
.SetCheck(BST_INDETERMINATE
);
255 //SetWindowTheme(m_LogList.GetSafeHwnd(), L"Explorer", NULL);
256 //SetWindowTheme(m_ChangedFileListCtrl.GetSafeHwnd(), L"Explorer", NULL);
258 // set up the columns
259 m_LogList
.DeleteAllItems();
261 m_LogList
.m_Path
=m_path
;
262 m_LogList
.m_hasWC
= m_LogList
.m_bShowWC
= !g_GitAdminDir
.IsBareRepo(g_Git
.m_CurrentDir
);
263 m_LogList
.InsertGitColumn();
265 m_ChangedFileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("LogDlg"), (GITSLC_POPALL
^ (GITSLC_POPCOMMIT
|GITSLC_POPIGNORE
|GITSLC_POPRESTORE
)), false, m_LogList
.m_hasWC
, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
267 GetDlgItem(IDC_LOGLIST
)->UpdateData(FALSE
);
271 m_tooltips
.Create(this);
272 CheckRegexpTooltip();
276 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
277 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
);
278 m_cFilter
.SetInfoIcon(IDI_LOGFILTER
);
279 m_cFilter
.SetValidator(this);
281 AdjustControlSize(IDC_HIDEPATHS
);
282 AdjustControlSize(IDC_LOG_FIRSTPARENT
);
283 AdjustControlSize(IDC_LOG_ALLBRANCH
);
284 AdjustControlSize(IDC_SHOWWHOLEPROJECT
);
285 AdjustControlSize(IDC_LOG_FOLLOWRENAMES
);
286 AdjustControlSize(IDC_LOG_SHOWTAGS
);
288 GetClientRect(m_DlgOrigRect
);
289 m_LogList
.GetClientRect(m_LogListOrigRect
);
290 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(m_MsgViewOrigRect
);
291 m_ChangedFileListCtrl
.GetClientRect(m_ChgOrigRect
);
293 m_DateFrom
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
294 m_DateTo
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
296 m_staticRef
.SetURL(CString());
299 AddAnchor(IDC_STATIC_REF
, TOP_LEFT
);
300 //AddAnchor(IDC_BUTTON_BROWSE_REF, TOP_LEFT);
301 AddAnchor(IDC_FROMLABEL
, TOP_LEFT
);
302 AddAnchor(IDC_DATEFROM
, TOP_LEFT
);
303 AddAnchor(IDC_TOLABEL
, TOP_LEFT
);
304 AddAnchor(IDC_DATETO
, TOP_LEFT
);
307 AddAnchor(IDC_SEARCHEDIT
, TOP_LEFT
, TOP_RIGHT
);
308 AddAnchor(IDC_LOG_JUMPTYPE
, TOP_RIGHT
);
309 AddAnchor(IDC_LOG_JUMPUP
, TOP_RIGHT
);
310 AddAnchor(IDC_LOG_JUMPDOWN
, TOP_RIGHT
);
312 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
313 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
314 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
315 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
316 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
318 AddAnchor(IDC_LOGINFO
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
319 AddAnchor(IDC_HIDEPATHS
, BOTTOM_LEFT
);
320 AddAnchor(IDC_LOG_ALLBRANCH
,BOTTOM_LEFT
);
321 AddAnchor(IDC_LOG_FOLLOWRENAMES
, BOTTOM_LEFT
);
322 AddAnchor(IDC_LOG_FIRSTPARENT
, BOTTOM_LEFT
);
323 AddAnchor(IDC_SHOWWHOLEPROJECT
, BOTTOM_LEFT
);
324 AddAnchor(IDC_LOG_SHOWTAGS
, BOTTOM_LEFT
);
325 AddAnchor(IDC_REFRESH
, BOTTOM_LEFT
);
326 AddAnchor(IDC_STATBUTTON
, BOTTOM_RIGHT
);
327 AddAnchor(IDC_PROGRESS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
328 AddAnchor(IDOK
, BOTTOM_RIGHT
);
329 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
330 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
332 if(this->m_bAllBranch
)
333 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
335 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_ALL_BRANCH
;
338 m_LogList
.m_ShowRefMask
|= LOGLIST_SHOWTAGS
;
340 m_LogList
.m_ShowRefMask
&= ~LOGLIST_SHOWTAGS
;
342 // SetPromptParentWindow(m_hWnd);
343 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL
)));
344 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL
)));
345 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT
)));
346 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1
)));
347 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2
)));
348 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG
)));
349 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF
)));
350 m_JumpType
.SetCurSel(0);
351 m_JumpUp
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
352 m_JumpDown
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
355 CenterWindow(CWnd::FromHandle(hWndExplorer
));
356 EnableSaveRestore(_T("LogDlg"));
358 DWORD yPos1
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
359 DWORD yPos2
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
360 RECT rcDlg
, rcLogList
, rcChgMsg
;
361 GetClientRect(&rcDlg
);
362 m_LogList
.GetWindowRect(&rcLogList
);
363 ScreenToClient(&rcLogList
);
364 m_ChangedFileListCtrl
.GetWindowRect(&rcChgMsg
);
365 ScreenToClient(&rcChgMsg
);
369 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
370 ScreenToClient(&rectSplitter
);
371 int delta
= yPos1
- rectSplitter
.top
;
373 if ((rcLogList
.bottom
+ delta
> rcLogList
.top
)&&(rcLogList
.bottom
+ delta
< rcChgMsg
.bottom
- 30))
375 m_wndSplitter1
.SetWindowPos(NULL
, rectSplitter
.left
, yPos1
, 0, 0, SWP_NOSIZE
);
382 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
383 ScreenToClient(&rectSplitter
);
384 int delta
= yPos2
- rectSplitter
.top
;
386 if ((rcChgMsg
.top
+ delta
< rcChgMsg
.bottom
)&&(rcChgMsg
.top
+ delta
> rcLogList
.top
+ 30))
388 m_wndSplitter2
.SetWindowPos(NULL
, rectSplitter
.left
, yPos2
, 0, 0, SWP_NOSIZE
);
397 // the dialog is used to select revisions
398 // enable the OK button if appropriate
403 // the dialog is used to just view log messages
404 // hide the OK button and set text on Cancel button to OK
405 GetDlgItemText(IDOK
, temp
);
406 SetDlgItemText(IDCANCEL
, temp
);
407 GetDlgItem(IDOK
)->ShowWindow(SW_HIDE
);
410 // first start a thread to obtain the log messages without
411 // blocking the dialog
413 //m_tFrom = (DWORD)-1;
415 // scroll to user selected or current revision
416 if (!m_hightlightRevision
.IsEmpty() && m_hightlightRevision
.GetLength() >= GIT_HASH_SIZE
)
417 m_LogList
.m_lastSelectedHash
= m_hightlightRevision
;
418 else if (!m_LogList
.m_endrev
.IsEmpty() && m_LogList
.m_endrev
.GetLength() >= GIT_HASH_SIZE
)
419 m_LogList
.m_lastSelectedHash
= m_hightlightRevision
;
422 if (g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, _T("HEAD")))
423 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
426 if (m_path
.IsEmpty() || m_path
.IsDirectory())
427 DialogEnableWindow(IDC_LOG_FOLLOWRENAMES
, FALSE
);
429 m_LogList
.FetchLogAsync(this);
431 GetDlgItem(IDC_LOGLIST
)->SetFocus();
437 LRESULT
CLogDlg::OnLogListLoading(WPARAM wParam
, LPARAM
/*lParam*/)
441 if( cur
== GITLOG_START
)
444 temp
.LoadString(IDS_PROGRESSWAIT
);
446 this->m_LogList
.ShowText(temp
, true);
448 // We use a progress bar while getting the logs
449 m_LogProgress
.SetRange32(0, 100);
450 m_LogProgress
.SetPos(0);
453 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
454 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
457 GetDlgItem(IDC_PROGRESS
)->ShowWindow(TRUE
);
459 //DialogEnableWindow(IDC_SHOWWHOLEPROJECT, FALSE);
460 //DialogEnableWindow(IDC_LOG_FIRSTPARENT, FALSE);
461 DialogEnableWindow(IDC_STATBUTTON
, FALSE
);
462 //DialogEnableWindow(IDC_REFRESH, FALSE);
463 DialogEnableWindow(IDC_HIDEPATHS
,FALSE
);
466 else if( cur
== GITLOG_END
)
468 if(this->m_LogList
.HasText())
470 this->m_LogList
.ClearText();
472 UpdateLogInfoLabel();
475 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
477 DialogEnableWindow(IDC_SHOWWHOLEPROJECT
, !m_bFollowRenames
);
479 DialogEnableWindow(IDC_STATBUTTON
, !(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
));
480 DialogEnableWindow(IDC_REFRESH
, TRUE
);
481 DialogEnableWindow(IDC_HIDEPATHS
,TRUE
);
483 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
484 GetDlgItem(IDC_PROGRESS
)->ShowWindow(FALSE
);
485 //CTime time=m_LogList.GetOldestTime();
487 m_LogList
.GetTimeRange(begin
,end
);
489 if(m_LogList
.m_From
== -1)
490 m_DateFrom
.SetTime(&begin
);
492 if(m_LogList
.m_To
== -1)
493 m_DateTo
.SetTime(&end
);
499 if(this->m_LogList
.HasText())
501 this->m_LogList
.ClearText();
502 this->m_LogList
.Invalidate();
504 UpdateLogInfoLabel();
505 m_LogProgress
.SetPos(cur
);
508 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
509 m_pTaskbarList
->SetProgressValue(m_hWnd
, cur
, 100);
514 void CLogDlg::SetDlgTitle()
516 if (m_sTitle
.IsEmpty())
517 GetWindowText(m_sTitle
);
519 if (m_LogList
.m_Path
.IsEmpty() || m_orgPath
.GetWinPathString().IsEmpty())
521 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
524 CAppUtils::SetWindowTitle(m_hWnd
, m_orgPath
.GetWinPathString(), m_sTitle
);
527 void CLogDlg::CheckRegexpTooltip()
529 CWnd
*pWnd
= GetDlgItem(IDC_SEARCHEDIT
);
530 // Since tooltip describes regexp features, show it only if regexps are enabled.
531 if (m_bFilterWithRegex
)
533 m_tooltips
.AddTool(pWnd
, IDS_LOG_FILTER_REGEX_TT
);
536 m_tooltips
.DelTool(pWnd
);
539 void CLogDlg::EnableOKButton()
543 // the dialog is used to select revisions
544 if (m_bSelectionMustBeSingle
)
546 // enable OK button if only a single revision is selected
547 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()==1));
549 else if (m_bSelectionMustBeContinuous
)
550 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()!=0)&&(m_LogList
.IsSelectionContinuous()));
552 DialogEnableWindow(IDOK
, m_LogList
.GetSelectedCount()!=0);
555 DialogEnableWindow(IDOK
, TRUE
);
558 CString
CLogDlg::GetTagInfo(GitRev
* pLogEntry
)
563 if(m_LogList
.m_HashMap
.find(pLogEntry
->m_CommitHash
) != m_LogList
.m_HashMap
.end())
565 STRING_VECTOR
&vector
= m_LogList
.m_HashMap
[pLogEntry
->m_CommitHash
];
566 for(int i
=0;i
<vector
.size();i
++)
568 if(vector
[i
].Find(_T("refs/tags/")) == 0 )
570 CString tag
= vector
[i
];
571 int start
= vector
[i
].Find(_T("^{}"));
577 cmd
.Format(_T("git.exe cat-file tag %s"), tag
);
579 if(g_Git
.Run(cmd
, &output
, NULL
, CP_UTF8
) == 0 )
585 if(!output
.IsEmpty())
587 output
= _T("\n*") + CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO
)) + _T("*\n\n") + output
;
593 void CLogDlg::FillLogMessageCtrl(bool bShow
/* = true*/)
595 // we fill here the log message rich edit control,
596 // and also populate the changed files list control
597 // according to the selected revision(s).
599 CRichEditCtrl
* pMsgView
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
600 // empty the log message view
601 pMsgView
->SetWindowText(_T(" "));
602 // empty the changed files list
603 m_ChangedFileListCtrl
.SetRedraw(FALSE
);
604 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
605 m_currentChangedArray
= NULL
;
606 //m_ChangedFileListCtrl.SetExtendedStyle ( LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER );
607 m_ChangedFileListCtrl
.DeleteAllItems();
609 // if we're not here to really show a selected revision, just
610 // get out of here after clearing the views, which is what is intended
611 // if that flag is not set.
615 m_ChangedFileListCtrl
.Invalidate();
616 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
617 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
621 // depending on how many revisions are selected, we have to do different
623 int selCount
= m_LogList
.GetSelectedCount();
626 // if nothing is selected, we have nothing more to do
627 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
628 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
631 else if (selCount
== 1)
633 // if one revision is selected, we have to fill the log message view
634 // with the corresponding log message, and also fill the changed files
636 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
637 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
638 if (selIndex
>= m_LogList
.m_arShownList
.GetCount())
640 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
641 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
644 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
647 // set the log message text
648 pMsgView
->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH
)) + _T(": ") + pLogEntry
->m_CommitHash
.ToString() + _T("\r\n\r\n"));
649 // turn bug ID's into links if the bugtraq: properties have been set
650 // and we can find a match of those in the log message
652 pMsgView
->SetSel(-1,-1);
654 SecureZeroMemory(&format
, sizeof(CHARFORMAT2
));
655 format
.cbSize
= sizeof(CHARFORMAT2
);
656 format
.dwMask
= CFM_BOLD
;
657 format
.dwEffects
= CFE_BOLD
;
658 pMsgView
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
660 CString msg
=_T("* ");
661 msg
+=pLogEntry
->GetSubject();
662 pMsgView
->ReplaceSel(msg
);
664 pMsgView
->SetSel(-1,-1);
665 format
.dwEffects
= 0;
666 pMsgView
->SendMessage(EM_SETCHARFORMAT
, SCF_SELECTION
, (LPARAM
)&format
);
669 msg
+=pLogEntry
->GetBody();
671 if(!pLogEntry
->m_Notes
.IsEmpty())
673 msg
+= _T("\n*") + CString(MAKEINTRESOURCE(IDS_NOTES
)) + _T("* ");
674 msg
+= pLogEntry
->m_Notes
;
678 msg
+=GetTagInfo(pLogEntry
);
680 pMsgView
->ReplaceSel(msg
);
683 pMsgView
->GetWindowText(text
);
684 // the rich edit control doesn't count the CR char!
685 // to be exact: CRLF is treated as one char.
688 m_LogList
.m_ProjectProperties
.FindBugID(text
, pMsgView
);
689 if (((DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\StyleCommitMessages"), TRUE
)) == TRUE
)
690 CAppUtils::FormatTextInRichEditControl(pMsgView
);
692 int HidePaths
=m_cHidePaths
.GetState() & 0x0003;
693 CString matchpath
=this->m_path
.GetGitPathString();
695 int count
= pLogEntry
->GetFiles(&m_LogList
).GetCount();
696 for(int i
=0;i
<count
&& (!matchpath
.IsEmpty());i
++)
698 if( m_bWholeProject
)
701 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
|CTGitPath::LOGACTIONS_GRAY
);
703 if(pLogEntry
->GetFiles(&m_LogList
)[i
].GetGitPathString().Left(matchpath
.GetLength()) != matchpath
&& pLogEntry
->GetFiles(&m_LogList
)[i
].GetGitOldPathString().Left(matchpath
.GetLength()) != matchpath
)
705 if(HidePaths
==BST_CHECKED
)
706 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
707 if(HidePaths
==BST_INDETERMINATE
)
708 ((CTGitPath
&)pLogEntry
->GetFiles(&m_LogList
)[i
]).m_Action
|= CTGitPath::LOGACTIONS_GRAY
;
712 m_ChangedFileListCtrl
.UpdateWithGitPathList(pLogEntry
->GetFiles(&m_LogList
));
713 m_ChangedFileListCtrl
.m_CurrentVersion
=pLogEntry
->m_CommitHash
;
714 if (pLogEntry
->m_CommitHash
.IsEmpty() && m_bShowUnversioned
)
716 m_ChangedFileListCtrl
.UpdateUnRevFileList(pLogEntry
->GetUnRevFiles());
717 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
| GITSLC_SHOWUNVERSIONED
);
720 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
722 m_ChangedFileListCtrl
.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES
)));
724 if(!pLogEntry
->m_IsDiffFiles
)
725 m_ChangedFileListCtrl
.SetBusy(TRUE
);
727 m_ChangedFileListCtrl
.SetBusy(FALSE
);
729 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
736 // more than one revision is selected:
737 // the log message view must be emptied
738 // the changed files list contains all the changed paths from all
739 // selected revisions, with 'doubles' removed
740 m_currentChangedPathList
= GetChangedPathsFromSelectedRevisions(true);
744 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
746 if (m_currentChangedArray
)
748 m_ChangedFileListCtrl
.SetItemCountEx(m_currentChangedArray
->GetCount());
749 m_ChangedFileListCtrl
.RedrawItems(0, m_currentChangedArray
->GetCount());
751 else if (m_currentChangedPathList
.GetCount())
753 m_ChangedFileListCtrl
.SetItemCountEx(m_currentChangedPathList
.GetCount());
754 m_ChangedFileListCtrl
.RedrawItems(0, m_currentChangedPathList
.GetCount());
758 m_ChangedFileListCtrl
.SetItemCountEx(0);
759 m_ChangedFileListCtrl
.Invalidate();
762 // sort according to the settings
763 if (m_nSortColumnPathList
> 0)
764 SetSortArrow(&m_ChangedFileListCtrl
, m_nSortColumnPathList
, m_bAscendingPathList
);
766 SetSortArrow(&m_ChangedFileListCtrl
, -1, false);
767 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
771 void CLogDlg::OnBnClickedRefresh()
776 void CLogDlg::Refresh (bool clearfilter
/*autoGoOnline*/)
779 m_LogList
.Refresh(clearfilter
);
781 FillLogMessageCtrl(false);
786 BOOL
CLogDlg::Cancel()
791 void CLogDlg::SaveSplitterPos()
795 CRegDWORD regPos1
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
796 CRegDWORD regPos2
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
798 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
799 ScreenToClient(&rectSplitter
);
800 regPos1
= rectSplitter
.top
;
801 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
802 ScreenToClient(&rectSplitter
);
803 regPos2
= rectSplitter
.top
;
807 void CLogDlg::OnCancel()
809 this->ShowWindow(SW_HIDE
);
811 // canceling means stopping the working thread if it's still running.
812 m_LogList
.SafeTerminateAsyncDiffThread();
813 if (this->IsThreadRunning())
815 m_LogList
.SafeTerminateThread();
823 void CLogDlg::CopyChangedSelectionToClipBoard()
826 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
828 return; // nothing is selected, get out of here
832 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
835 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
838 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
839 CTGitPath
*path
= (CTGitPath
*)m_ChangedFileListCtrl
.GetItemData(nItem
);
841 sPaths
+= path
->GetGitPathString();
842 sPaths
+= _T("\r\n");
848 // only one revision is selected in the log dialog top pane
849 // but multiple items could be selected in the changed items list
850 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
853 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
854 LogChangedPath
* changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(nItem
);
856 if ((m_cHidePaths
.GetState() & 0x0003)==BST_CHECKED
)
858 // some items are hidden! So find out which item the user really selected
859 INT_PTR selRealIndex
= -1;
860 for (INT_PTR hiddenindex
=0; hiddenindex
<pLogEntry
->pArChangedPaths
->GetCount(); ++hiddenindex
)
862 if (pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
)->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0)
864 if (selRealIndex
== nItem
)
866 changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
);
873 sPaths
+= changedlogpath
->sPath
;
874 sPaths
+= _T("\r\n");
880 CStringUtils::WriteAsciiStringToClipboard(sPaths
, GetSafeHwnd());
884 void CLogDlg::OnContextMenu(CWnd
* pWnd
, CPoint point
)
886 // we have two separate context menus:
887 // one shown on the log message list control,
888 // the other shown in the changed-files list control
889 int selCount
= m_LogList
.GetSelectedCount();
890 if ((selCount
== 1)&&(pWnd
== GetDlgItem(IDC_MSGVIEW
)))
892 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
895 selIndex
= m_LogList
.GetNextSelectedItem(pos
);
897 GitRev
*pRev
= ((GitRev
*)m_LogList
.m_arShownList
[selIndex
]);
899 if ((point
.x
== -1) && (point
.y
== -1))
902 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(&rect
);
903 ClientToScreen(&rect
);
904 point
= rect
.CenterPoint();
906 CString sMenuItemText
;
908 if (popup
.CreatePopupMenu())
910 // add the 'default' entries
911 sMenuItemText
.LoadString(IDS_SCIEDIT_COPY
);
912 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, WM_COPY
, sMenuItemText
);
913 sMenuItemText
.LoadString(IDS_SCIEDIT_SELECTALL
);
914 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, EM_SETSEL
, sMenuItemText
);
915 sMenuItemText
.LoadString(IDS_EDIT_NOTES
);
916 popup
.AppendMenuIcon( CGitLogList::ID_EDITNOTE
, sMenuItemText
, IDI_EDIT
);
918 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
922 break; // no command selected
925 ::SendMessage(GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), cmd
, 0, -1);
927 case CGitLogList::ID_EDITNOTE
:
928 CAppUtils::EditNote(pRev
);
929 this->FillLogMessageCtrl(true);
938 // since the log dialog is also used to select revisions for other
939 // dialogs, we have to do some work before closing this dialog
940 if (GetFocus() != GetDlgItem(IDOK
))
941 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
943 m_LogList
.SafeTerminateAsyncDiffThread();
944 if (this->IsThreadRunning())
946 m_LogList
.SafeTerminateThread();
949 // check that one and only one row is selected
950 if (m_LogList
.GetSelectedCount() == 1)
952 // get the selected row
953 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
954 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
955 if (selIndex
< m_LogList
.m_arShownList
.GetCount())
957 // all ok, pick up the revision
958 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
960 m_sSelectedHash
= pLogEntry
->m_CommitHash
;
968 if (!GetDlgItem(IDOK
)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL
))
969 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
973 GetDlgItemText(IDOK
, buttontext
);
974 temp
.LoadString(IDS_MSGBOX_CANCEL
);
975 if (temp
.Compare(buttontext
) != 0)
976 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
978 m_selectedRevs
.Clear();
979 m_selectedRevsOneRange
.Clear();
982 int selIndex
= m_LogList
.GetSelectionMark();
985 PLOGENTRYDATA pLogEntry
= NULL
;
986 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
987 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
988 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
989 git_revnum_t lowerRev
= pLogEntry
->Rev
;
990 git_revnum_t higherRev
= lowerRev
;
993 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
994 git_revnum_t rev
= pLogEntry
->Rev
;
995 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1001 if (m_sFilterText
.IsEmpty() && m_nSortColumn
== 0 && IsSelectionContinuous())
1003 m_selectedRevsOneRange
.AddRevRange(lowerRev
, higherRev
);
1005 BOOL bSentMessage
= FALSE
;
1006 if (m_LogList
.GetSelectedCount() == 1)
1008 // if only one revision is selected, check if the path/url with which the dialog was started
1009 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1010 // if it was copied, use the copy from revision as lowerRev
1011 if ((pLogEntry
)&&(pLogEntry
->pArChangedPaths
)&&(lowerRev
== higherRev
))
1013 CString sUrl
= m_path
.GetGitPathString();
1014 if (!m_path
.IsUrl())
1016 sUrl
= GetURLFromPath(m_path
);
1018 sUrl
= sUrl
.Mid(m_sRepositoryRoot
.GetLength());
1019 for (int cp
= 0; cp
< pLogEntry
->pArChangedPaths
->GetCount(); ++cp
)
1021 LogChangedPath
* pData
= pLogEntry
->pArChangedPaths
->SafeGetAt(cp
);
1024 if (sUrl
.Compare(pData
->sPath
) == 0)
1026 if (!pData
->sCopyFromPath
.IsEmpty())
1028 lowerRev
= pData
->lCopyFromRev
;
1029 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
), lowerRev
);
1030 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
), higherRev
);
1031 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1032 bSentMessage
= TRUE
;
1039 if ( !bSentMessage
)
1041 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
| MERGE_REVSELECTMINUSONE
), lowerRev
);
1042 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
| MERGE_REVSELECTMINUSONE
), higherRev
);
1043 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1044 if (m_selectedRevsOneRange
.GetCount())
1045 m_pNotifyWindow
->SendMessage(WM_REVLISTONERANGE
, 0, (LPARAM
)&m_selectedRevsOneRange
);
1050 CRegDWORD reg
= CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));
1055 void CLogDlg::DoDiffFromLog(INT_PTR selIndex
, GitRev
* rev1
, GitRev
* rev2
, bool /*blame*/, bool /*unified*/)
1057 DialogEnableWindow(IDOK
, FALSE
);
1058 // SetPromptApp(&theApp);
1059 theApp
.DoWaitCursor(1);
1062 GetTempPath(temppath
);
1065 file1
.Format(_T("%s%s_%s%s"),
1067 (*m_currentChangedArray
)[selIndex
].GetBaseFilename(),
1068 rev1
->m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()),
1069 (*m_currentChangedArray
)[selIndex
].GetFileExtension());
1072 file2
.Format(_T("%s\\%s_%s%s"),
1074 (*m_currentChangedArray
)[selIndex
].GetBaseFilename(),
1075 rev2
->m_CommitHash
.ToString().Left(g_Git
.GetShortHASHLength()),
1076 (*m_currentChangedArray
)[selIndex
].GetFileExtension());
1079 CTGitPath
&path
= (CTGitPath
&)(*m_currentChangedArray
)[selIndex
];
1081 g_Git
.GetOneFile(rev1
->m_CommitHash
.ToString(), path
, file1
);
1082 g_Git
.GetOneFile(rev2
->m_CommitHash
.ToString(), path
, file2
);
1084 CAppUtils::DiffFlags flags
;
1085 CAppUtils::StartExtDiff(file1
,file2
,_T("A"),_T("B"),
1086 g_Git
.m_CurrentDir
+ _T("\\") + path
.GetWinPathString(), g_Git
.m_CurrentDir
+ _T("\\") + path
.GetWinPathString(),
1087 rev1
->m_CommitHash
.ToString(), rev2
->m_CommitHash
.ToString(),
1090 theApp
.DoWaitCursor(-1);
1094 BOOL
CLogDlg::PreTranslateMessage(MSG
* pMsg
)
1096 // Skip Ctrl-C when copying text out of the log message or search filter
1097 bool bSkipAccelerator
= (pMsg
->message
== WM_KEYDOWN
&& (pMsg
->wParam
== 'C' || pMsg
->wParam
== VK_INSERT
) && (GetFocus() == GetDlgItem(IDC_MSGVIEW
) || GetFocus() == GetDlgItem(IDC_SEARCHEDIT
)) && GetKeyState(VK_CONTROL
) & 0x8000);
1098 if (pMsg
->message
== WM_KEYDOWN
&& pMsg
->wParam
=='\r')
1100 if (GetFocus()==GetDlgItem(IDC_LOGLIST
))
1102 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE
))
1104 m_LogList
.DiffSelectedRevWithPrevious();
1109 if (m_hAccel
&& !bSkipAccelerator
)
1111 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1116 if(::IsWindow(m_tooltips
.m_hWnd
))
1117 m_tooltips
.RelayEvent(pMsg
);
1118 return __super::PreTranslateMessage(pMsg
);
1122 BOOL
CLogDlg::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
1124 //if (this->IsThreadRunning())
1125 if(m_LogList
.m_bNoDispUpdates
)
1127 // only show the wait cursor over the list control
1129 ((pWnd
== GetDlgItem(IDC_LOGLIST
))||
1130 (pWnd
== GetDlgItem(IDC_MSGVIEW
))||
1131 (pWnd
== GetDlgItem(IDC_LOGMSG
))))
1133 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_WAIT
));
1138 if ((pWnd
) && (pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1139 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1141 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_ARROW
));
1143 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1146 void CLogDlg::OnBnClickedHelp()
1151 void CLogDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1153 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1155 //if (this->IsThreadRunning())
1156 if(m_LogList
.m_bNoDispUpdates
)
1158 if (pNMLV
->iItem
>= 0)
1160 this->m_LogList
.m_nSearchIndex
= pNMLV
->iItem
;
1161 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(pNMLV
->iItem
));
1162 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1163 if (pNMLV
->iSubItem
!= 0)
1165 if ((pNMLV
->iItem
== m_LogList
.m_arShownList
.GetCount()))
1167 // remove the selected state
1168 if (pNMLV
->uChanged
& LVIF_STATE
)
1170 m_LogList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1171 FillLogMessageCtrl();
1173 UpdateLogInfoLabel();
1177 if (pNMLV
->uChanged
& LVIF_STATE
)
1179 FillLogMessageCtrl();
1185 m_LogList
.m_lastSelectedHash
.Empty();
1186 FillLogMessageCtrl();
1190 UpdateLogInfoLabel();
1193 void CLogDlg::OnEnLinkMsgview(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1195 ENLINK
*pEnLink
= reinterpret_cast<ENLINK
*>(pNMHDR
);
1196 if (pEnLink
->msg
== WM_LBUTTONUP
)
1199 GetDlgItemText(IDC_MSGVIEW
, msg
);
1200 msg
.Replace(_T("\r\n"), _T("\n"));
1201 url
= msg
.Mid(pEnLink
->chrg
.cpMin
, pEnLink
->chrg
.cpMax
-pEnLink
->chrg
.cpMin
);
1202 if (!::PathIsURL(url
))
1204 url
= m_LogList
.m_ProjectProperties
.GetBugIDUrl(url
);
1205 url
= GetAbsoluteUrlFromRelativeUrl(url
);
1208 ShellExecute(this->m_hWnd
, _T("open"), url
, NULL
, NULL
, SW_SHOWDEFAULT
);
1213 void CLogDlg::OnBnClickedStatbutton()
1215 if (this->IsThreadRunning())
1217 if (m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
)
1218 return; // nothing or just the working copy changes are shown, so no statistics.
1219 // the statistics dialog expects the log entries to be sorted by date
1220 SortByColumn(3, false);
1223 m_LogList
.RecalculateShownList(&dlg
.m_ShowList
);
1225 dlg
.m_path
= m_orgPath
;
1227 // restore the previous sorting
1228 SortByColumn(m_nSortColumn
, m_bAscending
);
1229 OnTimer(LOGFILTER_TIMER
);
1232 void CLogDlg::DoSizeV1(int delta
)
1235 RemoveAnchor(IDC_LOGLIST
);
1236 RemoveAnchor(IDC_SPLITTERTOP
);
1237 RemoveAnchor(IDC_MSGVIEW
);
1238 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1239 RemoveAnchor(IDC_LOGMSG
);
1240 CSplitterControl::ChangeHeight(&m_LogList
, delta
, CW_TOPALIGN
);
1241 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), -delta
, CW_BOTTOMALIGN
);
1242 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
1243 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
1244 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
1245 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1246 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1250 m_LogList
.Invalidate();
1251 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1255 void CLogDlg::DoSizeV2(int delta
)
1258 RemoveAnchor(IDC_LOGLIST
);
1259 RemoveAnchor(IDC_SPLITTERTOP
);
1260 RemoveAnchor(IDC_MSGVIEW
);
1261 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1262 RemoveAnchor(IDC_LOGMSG
);
1263 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), delta
, CW_TOPALIGN
);
1264 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl
, -delta
, CW_BOTTOMALIGN
);
1265 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, TOP_RIGHT
);
1266 AddAnchor(IDC_SPLITTERTOP
, TOP_LEFT
, TOP_RIGHT
);
1267 AddAnchor(IDC_MSGVIEW
, TOP_LEFT
, BOTTOM_RIGHT
);
1268 AddAnchor(IDC_SPLITTERBOTTOM
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1269 AddAnchor(IDC_LOGMSG
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1273 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1274 m_ChangedFileListCtrl
.Invalidate();
1278 void CLogDlg::AdjustMinSize()
1280 // adjust the minimum size of the dialog to prevent the resizing from
1281 // moving the list control too far down.
1282 CRect rcChgListView
;
1283 m_ChangedFileListCtrl
.GetClientRect(rcChgListView
);
1285 m_LogList
.GetClientRect(rcLogList
);
1287 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(),
1288 m_DlgOrigRect
.Height()-m_ChgOrigRect
.Height()-m_LogListOrigRect
.Height()-m_MsgViewOrigRect
.Height()
1289 +rcChgListView
.Height()+rcLogList
.Height()+60));
1292 LRESULT
CLogDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
1296 if (wParam
== IDC_SPLITTERTOP
)
1298 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1299 DoSizeV1(pHdr
->delta
);
1301 else if (wParam
== IDC_SPLITTERBOTTOM
)
1303 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
1304 DoSizeV2(pHdr
->delta
);
1309 return CResizableDialog::DefWindowProc(message
, wParam
, lParam
);
1312 void CLogDlg::SetSplitterRange()
1314 if ((m_LogList
)&&(m_ChangedFileListCtrl
))
1317 m_LogList
.GetWindowRect(rcTop
);
1318 ScreenToClient(rcTop
);
1320 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(rcMiddle
);
1321 ScreenToClient(rcMiddle
);
1322 m_wndSplitter1
.SetRange(rcTop
.top
+30, rcMiddle
.bottom
-20);
1324 m_ChangedFileListCtrl
.GetWindowRect(rcBottom
);
1325 ScreenToClient(rcBottom
);
1326 m_wndSplitter2
.SetRange(rcMiddle
.top
+30, rcBottom
.bottom
-20);
1330 LRESULT
CLogDlg::OnClickedInfoIcon(WPARAM
/*wParam*/, LPARAM lParam
)
1332 // FIXME: x64 version would get this function called with unexpected parameters.
1336 RECT
* rect
= (LPRECT
)lParam
;
1339 point
= CPoint(rect
->left
, rect
->bottom
);
1340 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | (m_LogList.m_SelectedFilters & x ? MF_CHECKED : MF_UNCHECKED))
1342 if (popup
.CreatePopupMenu())
1344 temp
.LoadString(IDS_LOG_FILTER_SUBJECT
);
1345 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT
), LOGFILTER_SUBJECT
, temp
);
1347 temp
.LoadString(IDS_LOG_FILTER_MESSAGES
);
1348 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES
), LOGFILTER_MESSAGES
, temp
);
1350 temp
.LoadString(IDS_LOG_FILTER_PATHS
);
1351 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS
), LOGFILTER_PATHS
, temp
);
1353 temp
.LoadString(IDS_LOG_FILTER_AUTHORS
);
1354 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS
), LOGFILTER_AUTHORS
, temp
);
1356 temp
.LoadString(IDS_LOG_FILTER_REVS
);
1357 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS
), LOGFILTER_REVS
, temp
);
1359 temp
.LoadString(IDS_LOG_FILTER_REFNAME
);
1360 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME
), LOGFILTER_REFNAME
, temp
);
1362 if (m_LogList
.m_bShowBugtraqColumn
== TRUE
) {
1363 temp
.LoadString(IDS_LOG_FILTER_BUGIDS
);
1364 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID
), LOGFILTER_BUGID
, temp
);
1367 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1369 temp
.LoadString(IDS_LOG_FILTER_REGEX
);
1370 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterWithRegex
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_REGEX
, temp
);
1373 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1377 if (selection
== LOGFILTER_REGEX
)
1379 m_bFilterWithRegex
= !m_bFilterWithRegex
;
1380 CRegDWORD b
= CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE
);
1381 b
= m_bFilterWithRegex
;
1382 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
;
1384 CheckRegexpTooltip();
1388 m_LogList
.m_SelectedFilters
^= selection
;
1391 // Reload only if a search text is entered
1392 if (!m_LogList
.m_sFilterText
.IsEmpty())
1393 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
1399 LRESULT
CLogDlg::OnClickedCancelFilter(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
1402 KillTimer(LOGFILTER_TIMER
);
1404 m_LogList
.m_sFilterText
.Empty();
1406 theApp
.DoWaitCursor(1);
1407 CStoreSelection
storeselection(this);
1408 FillLogMessageCtrl(false);
1410 m_LogList
.RemoveFilter();
1415 m_LogList
.GetTimeRange(begin
,end
);
1416 m_DateFrom
.SetTime(&begin
);
1417 m_DateTo
.SetTime(&end
);
1419 theApp
.DoWaitCursor(-1);
1420 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
1421 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
1422 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
1423 UpdateLogInfoLabel();
1429 void CLogDlg::SetFilterCueText()
1431 CString
temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY
));
1434 if (m_LogList
.m_SelectedFilters
& LOGFILTER_SUBJECT
)
1436 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT
));
1439 if (m_LogList
.m_SelectedFilters
& LOGFILTER_MESSAGES
)
1441 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1443 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES
));
1446 if (m_LogList
.m_SelectedFilters
& LOGFILTER_PATHS
)
1448 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1450 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS
));
1453 if (m_LogList
.m_SelectedFilters
& LOGFILTER_AUTHORS
)
1455 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1457 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS
));
1460 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REVS
)
1462 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1464 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS
));
1467 if (m_LogList
.m_SelectedFilters
& LOGFILTER_BUGID
)
1469 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
1471 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS
));
1474 // to make the cue banner text appear more to the right of the edit control
1475 temp
= _T(" ")+temp
;
1476 m_cFilter
.SetCueBanner(temp
.TrimRight());
1479 bool CLogDlg::Validate(LPCTSTR string
)
1481 if (!m_bFilterWithRegex
)
1484 return m_LogList
.ValidateRegexp(string
, pat
, false);
1488 void CLogDlg::OnTimer(UINT_PTR nIDEvent
)
1490 if (nIDEvent
== LOGFTIME_TIMER
)
1492 KillTimer(LOGFTIME_TIMER
);
1494 m_LogList
.Refresh(FALSE
);
1495 FillLogMessageCtrl(false);
1498 if (nIDEvent
== LOGFILTER_TIMER
)
1500 KillTimer(LOGFILTER_TIMER
);
1502 m_LogList
.Refresh(FALSE
);
1503 FillLogMessageCtrl(false);
1506 /* we will use git built-in grep to filter log */
1507 if (this->IsThreadRunning())
1509 // thread still running! So just restart the timer.
1510 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
1513 CWnd
* focusWnd
= GetFocus();
1514 bool bSetFocusToFilterControl
= ((focusWnd
!= GetDlgItem(IDC_DATEFROM
))&&(focusWnd
!= GetDlgItem(IDC_DATETO
))
1515 && (focusWnd
!= GetDlgItem(IDC_LOGLIST
)));
1516 if (m_LogList
.m_sFilterText
.IsEmpty())
1518 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
1519 // do not return here!
1520 // we also need to run the filter if the filter text is empty:
1521 // 1. to clear an existing filter
1522 // 2. to rebuild the m_arShownList after sorting
1524 theApp
.DoWaitCursor(1);
1525 CStoreSelection
storeselection(this);
1526 KillTimer(LOGFILTER_TIMER
);
1527 FillLogMessageCtrl(false);
1529 // now start filter the log list
1530 m_LogList
.StartFilter();
1532 if ( m_LogList
.GetItemCount()==1 )
1534 m_LogList
.SetSelectionMark(0);
1535 m_LogList
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
1537 theApp
.DoWaitCursor(-1);
1538 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
1539 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
1540 if (bSetFocusToFilterControl
)
1541 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
1542 UpdateLogInfoLabel();
1544 } // if (nIDEvent == LOGFILTER_TIMER)
1545 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
))));
1546 __super::OnTimer(nIDEvent
);
1549 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
1554 m_DateTo
.GetTime(_time
);
1556 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 23, 59, 59);
1557 if (time
.GetTime() != m_LogList
.m_To
)
1559 m_LogList
.m_To
= (DWORD
)time
.GetTime();
1560 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
1565 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1571 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
1577 m_DateFrom
.GetTime(_time
);
1579 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 0, 0, 0);
1580 if (time
.GetTime() != m_LogList
.m_From
)
1582 m_LogList
.m_From
= (DWORD
)time
.GetTime();
1583 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
1588 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
1594 void CLogDlg::OnCbnSelchangeJumpType()
1596 // reserved for future use
1599 void CLogDlg::OnBnClickedJumpUp()
1601 int sel
= m_JumpType
.GetCurSel();
1602 if (sel
< 0) return;
1603 JumpType jumpType
= (JumpType
)sel
;
1608 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1611 index
= m_LogList
.GetNextSelectedItem(pos
);
1612 if (index
== 0) return;
1614 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
1615 if (jumpType
== JumpType_AuthorEmail
)
1616 strValue
= data
->GetAuthorEmail();
1617 else if (jumpType
== JumpType_CommitterEmail
)
1618 strValue
= data
->GetCommitterEmail();
1619 else if (jumpType
== JumpType_Parent1
)
1620 hashValue
= data
->m_CommitHash
;
1621 else if (jumpType
== JumpType_Parent2
)
1622 hashValue
= data
->m_CommitHash
;
1623 else if (jumpType
== JumpType_TagFF
)
1624 hashValue
= data
->m_CommitHash
;
1626 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1633 index
= m_LogList
.GetNextSelectedItem(pos
);
1634 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1636 m_LogList
.SetSelectionMark(-1);
1638 for (int i
= index
- 1; i
>= 0; i
--)
1641 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1642 if (jumpType
== JumpType_AuthorEmail
)
1643 found
= strValue
== data
->GetAuthorEmail();
1644 else if (jumpType
== JumpType_CommitterEmail
)
1645 found
= strValue
== data
->GetCommitterEmail();
1646 else if (jumpType
== JumpType_MergePoint
)
1647 found
= data
->ParentsCount() > 1;
1648 else if (jumpType
== JumpType_Parent1
)
1650 if (data
->m_ParentHash
.size() > 0)
1651 found
= data
->m_ParentHash
[0] == hashValue
;
1653 else if (jumpType
== JumpType_Parent2
)
1655 if (data
->m_ParentHash
.size() > 1)
1656 found
= data
->m_ParentHash
[1] == hashValue
;
1658 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
1660 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
1661 for (int j
= 0; j
< refList
.size(); j
++)
1663 if (refList
[j
].Left(10) == _T("refs/tags/"))
1670 if (found
&& jumpType
== JumpType_TagFF
)
1671 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
1676 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
1677 m_LogList
.EnsureVisible(i
, FALSE
);
1678 m_LogList
.SetSelectionMark(i
);
1683 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
1686 void CLogDlg::OnBnClickedJumpDown()
1688 int jumpType
= m_JumpType
.GetCurSel();
1689 if (jumpType
< 0) return;
1694 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1697 index
= m_LogList
.GetNextSelectedItem(pos
);
1698 if (index
== 0) return;
1700 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
1701 if (jumpType
== JumpType_AuthorEmail
)
1702 strValue
= data
->GetAuthorEmail();
1703 else if (jumpType
== JumpType_CommitterEmail
)
1704 strValue
= data
->GetCommitterEmail();
1705 else if (jumpType
== JumpType_Parent1
)
1707 if (data
->m_ParentHash
.size() > 0)
1708 hashValue
= data
->m_ParentHash
.at(0);
1712 else if (jumpType
== JumpType_Parent2
)
1714 if (data
->m_ParentHash
.size() > 1)
1715 hashValue
= data
->m_ParentHash
.at(1);
1719 else if (jumpType
== JumpType_TagFF
)
1720 hashValue
= data
->m_CommitHash
;
1722 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1729 index
= m_LogList
.GetNextSelectedItem(pos
);
1730 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1732 m_LogList
.SetSelectionMark(-1);
1734 for (int i
= index
+ 1; i
< m_LogList
.GetItemCount(); i
++)
1737 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1738 if (jumpType
== JumpType_AuthorEmail
)
1739 found
= strValue
== data
->GetAuthorEmail();
1740 else if (jumpType
== JumpType_CommitterEmail
)
1741 found
= strValue
== data
->GetCommitterEmail();
1742 else if (jumpType
== JumpType_MergePoint
)
1743 found
= data
->ParentsCount() > 1;
1744 else if (jumpType
== JumpType_Parent1
)
1745 found
= data
->m_CommitHash
== hashValue
;
1746 else if (jumpType
== JumpType_Parent2
)
1747 found
= data
->m_CommitHash
== hashValue
;
1748 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
1750 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
1751 for (int j
= 0; j
< refList
.size(); j
++)
1753 if (refList
[j
].Left(10) == _T("refs/tags/"))
1760 if (found
&& jumpType
== JumpType_TagFF
)
1761 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
1766 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
1767 m_LogList
.EnsureVisible(i
, FALSE
);
1768 m_LogList
.SetSelectionMark(i
);
1773 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
1776 CTGitPathList
CLogDlg::GetChangedPathsFromSelectedRevisions(bool /*bRelativePaths*/ /* = false */, bool /*bUseFilter*/ /* = true */)
1778 CTGitPathList pathList
;
1781 if (m_sRepositoryRoot
.IsEmpty() && (bRelativePaths
== false))
1783 m_sRepositoryRoot
= GetRepositoryRoot(m_path
);
1785 if (m_sRepositoryRoot
.IsEmpty() && (bRelativePaths
== false))
1788 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1793 int nextpos
= m_LogList
.GetNextSelectedItem(pos
);
1794 if (nextpos
>= m_arShownList
.GetCount())
1796 PLOGENTRYDATA pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(nextpos
));
1797 LogChangedPathArray
* cpatharray
= pLogEntry
->pArChangedPaths
;
1798 for (INT_PTR cpPathIndex
= 0; cpPathIndex
<cpatharray
->GetCount(); ++cpPathIndex
)
1800 LogChangedPath
* cpath
= cpatharray
->SafeGetAt(cpPathIndex
);
1804 if (!bRelativePaths
)
1805 path
.SetFromGit(m_sRepositoryRoot
);
1806 path
.AppendPathString(cpath
->sPath
);
1808 ((m_cHidePaths
.GetState() & 0x0003)!=BST_CHECKED
)||
1809 (cpath
->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0))
1810 pathList
.AddPath(path
);
1815 pathList
.RemoveDuplicates();
1820 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
1828 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscRevSort());
1830 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescRevSort());
1836 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscActionSort());
1838 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescActionSort());
1844 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscAuthorSort());
1846 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescAuthorSort());
1852 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscDateSort());
1854 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescDateSort());
1857 case 4: // Message or bug id
1858 if (m_bShowBugtraqColumn
)
1861 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscBugIDSort());
1863 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescBugIDSort());
1866 // fall through here
1870 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscMessageSort());
1872 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescMessageSort());
1882 void CLogDlg::OnLvnColumnclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1884 if (this->IsThreadRunning())
1885 return; //no sorting while the arrays are filled
1887 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1888 const int nColumn
= pNMLV
->iSubItem
;
1889 m_bAscending
= nColumn
== m_nSortColumn
? !m_bAscending
: TRUE
;
1890 m_nSortColumn
= nColumn
;
1891 SortByColumn(m_nSortColumn
, m_bAscending
);
1892 SetSortArrow(&m_LogList
, m_nSortColumn
, !!m_bAscending
);
1893 SortShownListArray();
1894 m_LogList
.Invalidate();
1895 UpdateLogInfoLabel();
1897 UNREFERENCED_PARAMETER(pNMHDR
);
1902 void CLogDlg::SortShownListArray()
1904 // make sure the shown list still matches the filter after sorting.
1905 OnTimer(LOGFILTER_TIMER
);
1906 // clear the selection states
1907 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1910 m_LogList
.SetItemState(m_LogList
.GetNextSelectedItem(pos
), 0, LVIS_SELECTED
);
1912 m_LogList
.SetSelectionMark(-1);
1915 void CLogDlg::SetSortArrow(CListCtrl
* control
, int nColumn
, bool bAscending
)
1917 if (control
== NULL
)
1919 // set the sort arrow
1920 CHeaderCtrl
* pHeader
= control
->GetHeaderCtrl();
1921 HDITEM HeaderItem
= {0};
1922 HeaderItem
.mask
= HDI_FORMAT
;
1923 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
1925 pHeader
->GetItem(i
, &HeaderItem
);
1926 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
1927 pHeader
->SetItem(i
, &HeaderItem
);
1931 pHeader
->GetItem(nColumn
, &HeaderItem
);
1932 HeaderItem
.fmt
|= (bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
1933 pHeader
->SetItem(nColumn
, &HeaderItem
);
1937 int CLogDlg::m_nSortColumnPathList
= 0;
1938 bool CLogDlg::m_bAscendingPathList
= false;
1940 void CLogDlg::OnBnClickedHidepaths()
1942 FillLogMessageCtrl();
1943 m_ChangedFileListCtrl
.Invalidate();
1946 void CLogDlg::UpdateLogInfoLabel()
1951 long selectedrevs
= 0;
1952 int count
= (int)m_LogList
.m_arShownList
.GetCount();
1956 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(0)))->m_CommitHash
;
1957 if(this->m_LogList
.m_bShowWC
&& rev1
.IsEmpty()&&(count
>1))
1959 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(start
)))->m_CommitHash
;
1960 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_arShownList.GetCount()-1));
1961 rev2
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(count
-1)))->m_CommitHash
;
1962 selectedrevs
= m_LogList
.GetSelectedCount();
1965 sTemp
.Format(IDS_PROC_LOG_STATS
,
1967 rev2
.ToString().Left(g_Git
.GetShortHASHLength()), rev1
.ToString().Left(g_Git
.GetShortHASHLength()), selectedrevs
);
1969 if(selectedrevs
== 1)
1971 CString str
=m_ChangedFileListCtrl
.GetStatisticsString(true);
1972 str
.Replace(_T('\n'), _T(' '));
1973 sTemp
+= _T("\r\n") + str
;
1980 void CLogDlg::OnDtnDropdownDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
1982 // the date control should not show the "today" button
1983 CMonthCalCtrl
* pCtrl
= m_DateFrom
.GetMonthCalCtrl();
1985 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
1989 void CLogDlg::OnDtnDropdownDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
1991 // the date control should not show the "today" button
1992 CMonthCalCtrl
* pCtrl
= m_DateTo
.GetMonthCalCtrl();
1994 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
1998 void CLogDlg::OnSize(UINT nType
, int cx
, int cy
)
2000 __super::OnSize(nType
, cx
, cy
);
2005 void CLogDlg::OnRefresh()
2009 this->m_LogProgress
.SetPos(0);
2015 void CLogDlg::OnFocusFilter()
2017 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2020 void CLogDlg::OnEditCopy()
2022 if (GetFocus() == &m_ChangedFileListCtrl
)
2023 CopyChangedSelectionToClipBoard();
2025 m_LogList
.CopySelectionToClipBoard();
2028 CString
CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString
& url
)
2030 // is the URL a relative one?
2031 if (url
.Left(2).Compare(_T("^/")) == 0)
2033 // URL is relative to the repository root
2034 CString url1
= m_sRepositoryRoot
+ url
.Mid(1);
2035 TCHAR buf
[INTERNET_MAX_URL_LENGTH
];
2036 DWORD len
= url
.GetLength();
2037 if (UrlCanonicalize((LPCTSTR
)url1
, buf
, &len
, 0) == S_OK
)
2038 return CString(buf
, len
);
2041 else if (url
[0] == '/')
2043 // URL is relative to the server's hostname
2045 // find the server's hostname
2046 int schemepos
= m_sRepositoryRoot
.Find(_T("//"));
2049 sHost
= m_sRepositoryRoot
.Left(m_sRepositoryRoot
.Find('/', schemepos
+3));
2050 CString url1
= sHost
+ url
;
2051 TCHAR buf
[INTERNET_MAX_URL_LENGTH
];
2052 DWORD len
= url
.GetLength();
2053 if (UrlCanonicalize((LPCTSTR
)url
, buf
, &len
, 0) == S_OK
)
2054 return CString(buf
, len
);
2062 void CLogDlg::OnEnChangeSearchedit()
2065 if (m_LogList
.m_sFilterText
.IsEmpty())
2067 CStoreSelection
storeselection(this);
2068 // clear the filter, i.e. make all entries appear
2069 theApp
.DoWaitCursor(1);
2070 KillTimer(LOGFILTER_TIMER
);
2071 FillLogMessageCtrl(false);
2074 //m_LogList.StartFilter();
2076 InterlockedExchange(&m_bNoDispUpdates
, TRUE
);
2077 m_arShownList
.RemoveAll();
2078 for (DWORD i
=0; i
<m_logEntries
.size(); ++i
)
2080 if (IsEntryInDateRange(i
))
2081 m_arShownList
.Add(m_logEntries
[i
]);
2083 InterlockedExchange(&m_bNoDispUpdates
, FALSE
);
2084 m_LogList
.DeleteAllItems();
2085 m_LogList
.SetItemCountEx(ShownCountWithStopped());
2086 m_LogList
.RedrawItems(0, ShownCountWithStopped());
2087 m_LogList
.SetRedraw(false);
2088 ResizeAllListCtrlCols();
2089 m_LogList
.SetRedraw(true);
2091 theApp
.DoWaitCursor(-1);
2092 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2093 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2094 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2095 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
2098 if (Validate(m_LogList
.m_sFilterText
))
2099 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
2101 KillTimer(LOGFILTER_TIMER
);
2105 void CLogDlg::OnBnClickedAllBranch()
2109 if(this->m_bAllBranch
)
2110 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
2112 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_ALL_BRANCH
;
2116 FillLogMessageCtrl(false);
2119 void CLogDlg::OnBnClickedFollowRenames()
2123 if(m_bFollowRenames
)
2125 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_FOLLOW
;
2129 m_bAllBranch
= FALSE
;
2130 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_ALL_BRANCH
;
2135 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_FOLLOW
;
2137 DialogEnableWindow(IDC_LOG_ALLBRANCH
, !m_bFollowRenames
);
2138 DialogEnableWindow(IDC_SHOWWHOLEPROJECT
, !m_bFollowRenames
);
2142 FillLogMessageCtrl(false);
2145 void CLogDlg::OnBnClickedShowTags()
2150 m_LogList
.m_ShowRefMask
|= LOGLIST_SHOWTAGS
;
2152 m_LogList
.m_ShowRefMask
&= ~LOGLIST_SHOWTAGS
;
2154 m_LogList
.Invalidate();
2157 void CLogDlg::OnBnClickedBrowseRef()
2159 CString newRef
= CBrowseRefsDlg::PickRef(false,m_LogList
.GetStartRef());
2160 if(newRef
.IsEmpty())
2163 SetStartRef(newRef
);
2164 ((CButton
*)GetDlgItem(IDC_LOG_ALLBRANCH
))->SetCheck(0);
2166 OnBnClickedAllBranch();
2169 void CLogDlg::ShowStartRef()
2171 //Show ref name on top
2172 if(!::IsWindow(m_hWnd
))
2176 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES
)));
2177 m_staticRef
.Invalidate(TRUE
);
2181 CString showStartRef
= m_LogList
.GetStartRef();
2182 if(showStartRef
.IsEmpty())
2185 if (g_Git
.Run(L
"git symbolic-ref HEAD", &showStartRef
, NULL
, CP_UTF8
))
2186 showStartRef
= CString(MAKEINTRESOURCE(IDS_PROC_LOG_NOBRANCH
));
2187 showStartRef
.Trim(L
"\r\n\t ");
2191 if(wcsncmp(showStartRef
,L
"refs/",5) == 0)
2192 showStartRef
= showStartRef
.Mid(5);
2193 if(wcsncmp(showStartRef
,L
"heads/",6) == 0)
2194 showStartRef
= showStartRef
.Mid(6);
2196 m_staticRef
.SetWindowText(showStartRef
);
2197 m_staticRef
.Invalidate(TRUE
);
2200 void CLogDlg::SetStartRef(const CString
& StartRef
)
2202 m_LogList
.SetStartRef(StartRef
);
2204 if (m_hightlightRevision
.IsEmpty())
2206 if (g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, StartRef
))
2208 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of \"") + StartRef
+ _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
2210 m_hightlightRevision
= m_LogList
.m_lastSelectedHash
;
2217 void CLogDlg::OnBnClickedFirstParent()
2221 if(this->m_bFirstParent
)
2222 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_FIRST_PARENT
;
2224 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_FIRST_PARENT
;
2228 FillLogMessageCtrl(false);
2232 void CLogDlg::OnBnClickShowWholeProject()
2236 if(this->m_bWholeProject
)
2238 m_LogList
.m_Path
.Reset();
2240 DialogEnableWindow(IDC_LOG_FOLLOWRENAMES
, FALSE
);
2244 m_LogList
.m_Path
=m_path
;
2245 DialogEnableWindow(IDC_LOG_FOLLOWRENAMES
, !(m_path
.IsEmpty() || m_path
.IsDirectory()));
2252 FillLogMessageCtrl(false);
2256 LRESULT
CLogDlg::OnRefLogChanged(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
2262 LRESULT
CLogDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
2264 m_pTaskbarList
.Release();
2265 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);