1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2009, 2015 - TortoiseSVN
4 // Copyright (C) 2008-2015 - 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"
23 #include "StatGraphDlg.h"
25 #include "MessageBox.h"
28 #include "StringUtils.h"
29 #include "UnicodeUtils.h"
32 #include "BrowseRefsDlg.h"
33 #include "SmartHandle.h"
34 #include "LogOrdering.h"
35 #include "ClipboardHelper.h"
37 #define WM_TGIT_REFRESH_SELECTION (WM_APP + 1)
39 IMPLEMENT_DYNAMIC(CLogDlg
, CResizableStandAloneDialog
)
40 CLogDlg::CLogDlg(CWnd
* pParent
/*=NULL*/)
41 : CResizableStandAloneDialog(CLogDlg::IDD
, pParent
)
44 , m_bFollowRenames(false)
46 , m_bSelectionMustBeSingle(true)
48 , m_bShowLocalBranches(true)
49 , m_bShowRemoteBranches(true)
52 , m_bWalkBehavior(FALSE
)
53 , m_bFirstParent(false)
54 , m_bWholeProject(FALSE
)
55 , m_iCompressedGraph(0)
57 , m_bSelectionMustBeContinuous(false)
60 , m_pNotifyWindow(NULL
)
64 , m_bNavigatingWithSelect(false)
66 m_bFilterWithRegex
= !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), FALSE
);
67 m_bFilterCaseSensitively
= !!CRegDWORD(L
"Software\\TortoiseGit\\FilterCaseSensitively", FALSE
);
68 m_bAsteriskLogPrefix
= !!CRegDWORD(L
"Software\\TortoiseGit\\AsteriskLogPrefix", TRUE
);
69 m_LogList
.m_SelectedFilters
= CRegDWORD(_T("Software\\TortoiseGit\\SelectedLogFilters"), LOGFILTER_ALL
);
72 str
=g_Git
.m_CurrentDir
;
73 str
.Replace(_T(":"),_T("_"));
74 str
=CString(_T("Software\\TortoiseGit\\LogDialog\\AllBranch\\"))+str
;
76 m_regbAllBranch
=CRegDWORD(str
,FALSE
);
78 m_bAllBranch
=m_regbAllBranch
;
80 str
= g_Git
.m_CurrentDir
;
81 str
.Replace(_T(":"),_T("_"));
82 m_regShowWholeProject
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\") + str
, FALSE
);
83 m_bWholeProject
= m_regShowWholeProject
;
84 m_regbShowTags
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowTags\\") + str
, TRUE
);
85 m_bShowTags
= !!m_regbShowTags
;
86 m_regbShowLocalBranches
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowLocalBranches\\") + str
, TRUE
);
87 m_bShowLocalBranches
= !!m_regbShowLocalBranches
;
88 m_regbShowRemoteBranches
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowRemoteBranches\\") + str
, TRUE
);
89 m_bShowRemoteBranches
= !!m_regbShowRemoteBranches
;
91 m_bShowUnversioned
= CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE
);
93 m_bShowGravatar
= !!CRegDWORD(_T("Software\\TortoiseGit\\EnableGravatar"), FALSE
);
94 m_regbShowGravatar
= CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowGravatar\\") + str
, m_bShowGravatar
);
95 m_bShowGravatar
= !!m_regbShowGravatar
;
96 m_bShowDescribe
= !!CRegDWORD(_T("Software\\TortoiseGit\\ShowDescribe"));
102 m_regbAllBranch
= m_bAllBranch
;
103 m_regbShowTags
= m_bShowTags
;
104 m_regbShowLocalBranches
= m_bShowLocalBranches
;
105 m_regbShowRemoteBranches
= m_bShowRemoteBranches
;
106 m_regbShowGravatar
= m_bShowGravatar
;
109 void CLogDlg::DoDataExchange(CDataExchange
* pDX
)
111 CResizableStandAloneDialog::DoDataExchange(pDX
);
112 DDX_Control(pDX
, IDC_LOGLIST
, m_LogList
);
113 DDX_Control(pDX
, IDC_LOGMSG
, m_ChangedFileListCtrl
);
114 DDX_Control(pDX
, IDC_PROGRESS
, m_LogProgress
);
115 DDX_Control(pDX
, IDC_SPLITTERTOP
, m_wndSplitter1
);
116 DDX_Control(pDX
, IDC_SPLITTERBOTTOM
, m_wndSplitter2
);
117 DDX_Text(pDX
, IDC_SEARCHEDIT
, m_LogList
.m_sFilterText
);
118 DDX_Control(pDX
, IDC_DATEFROM
, m_DateFrom
);
119 DDX_Control(pDX
, IDC_DATETO
, m_DateTo
);
120 DDX_Control(pDX
, IDC_LOG_JUMPTYPE
, m_JumpType
);
121 DDX_Control(pDX
, IDC_LOG_JUMPUP
, m_JumpUp
);
122 DDX_Control(pDX
, IDC_LOG_JUMPDOWN
, m_JumpDown
);
123 DDX_Text(pDX
, IDC_LOGINFO
, m_sLogInfo
);
124 DDX_Check(pDX
, IDC_LOG_ALLBRANCH
,m_bAllBranch
);
125 DDX_Check(pDX
, IDC_WHOLE_PROJECT
, m_bWholeProject
);
126 DDX_Check(pDX
, IDC_WALKBEHAVIOUR
, m_bWalkBehavior
);
127 DDX_Control(pDX
, IDC_SEARCHEDIT
, m_cFilter
);
128 DDX_Control(pDX
, IDC_STATIC_REF
, m_staticRef
);
129 DDX_Control(pDX
, IDC_PIC_AUTHOR
, m_gravatar
);
130 DDX_Control(pDX
, IDC_FILTER
, m_cFileFilter
);
133 BEGIN_MESSAGE_MAP(CLogDlg
, CResizableStandAloneDialog
)
136 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGLIST
, OnLvnItemchangedLoglist
)
137 ON_NOTIFY(LVN_ITEMCHANGED
, IDC_LOGMSG
, OnLvnItemchangedLogmsg
)
138 ON_NOTIFY(EN_LINK
, IDC_MSGVIEW
, OnEnLinkMsgview
)
139 ON_EN_VSCROLL(IDC_MSGVIEW
, OnEnscrollMsgview
)
140 ON_EN_HSCROLL(IDC_MSGVIEW
, OnEnscrollMsgview
)
141 ON_BN_CLICKED(IDC_STATBUTTON
, OnBnClickedStatbutton
)
143 ON_MESSAGE(WM_TGIT_REFRESH_SELECTION
, OnRefreshSelection
)
144 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED
, OnClickedInfoIcon
)
145 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED
, OnClickedCancelFilter
)
147 ON_MESSAGE(MSG_LOAD_PERCENTAGE
,OnLogListLoading
)
149 ON_EN_CHANGE(IDC_SEARCHEDIT
, OnEnChangeSearchedit
)
151 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATETO
, OnDtnDatetimechangeDateto
)
152 ON_NOTIFY(DTN_DATETIMECHANGE
, IDC_DATEFROM
, OnDtnDatetimechangeDatefrom
)
153 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE
, &CLogDlg::OnCbnSelchangeJumpType
)
154 ON_COMMAND(IDC_LOG_JUMPUP
, &CLogDlg::OnBnClickedJumpUp
)
155 ON_COMMAND(IDC_LOG_JUMPDOWN
, &CLogDlg::OnBnClickedJumpDown
)
156 ON_COMMAND(ID_GO_UP
, &CLogDlg::OnBnClickedJumpUp
)
157 ON_COMMAND(ID_GO_DOWN
, &CLogDlg::OnBnClickedJumpDown
)
158 ON_BN_CLICKED(IDC_WALKBEHAVIOUR
, OnBnClickedWalkBehaviour
)
159 ON_BN_CLICKED(IDC_VIEW
, OnBnClickedView
)
160 ON_BN_CLICKED(IDC_WHOLE_PROJECT
, OnBnClickShowWholeProject
)
161 ON_NOTIFY(LVN_COLUMNCLICK
,IDC_LOGLIST
, OnLvnColumnclick
)
162 ON_COMMAND(MSG_FETCHED_DIFF
, OnBnClickedHidepaths
)
163 ON_BN_CLICKED(IDC_LOG_ALLBRANCH
, OnBnClickedAllBranch
)
164 ON_EN_CHANGE(IDC_FILTER
, OnEnChangeFileFilter
)
166 ON_NOTIFY(DTN_DROPDOWN
, IDC_DATEFROM
, &CLogDlg::OnDtnDropdownDatefrom
)
168 ON_BN_CLICKED(IDC_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
169 ON_STN_CLICKED(IDC_STATIC_REF
, &CLogDlg::OnBnClickedBrowseRef
)
170 ON_COMMAND(ID_LOGDLG_REFRESH
, &CLogDlg::OnBnClickedRefresh
)
171 ON_COMMAND(ID_GO_BACKWARD_SELECT
, &CLogDlg::GoBackAndSelect
)
172 ON_COMMAND(ID_GO_FORWARD_SELECT
, &CLogDlg::GoForwardAndSelect
)
173 ON_COMMAND(ID_GO_BACKWARD
, &CLogDlg::GoBack
)
174 ON_COMMAND(ID_GO_FORWARD
, &CLogDlg::GoForward
)
175 ON_COMMAND(ID_SELECT_SEARCHFIELD
, &CLogDlg::OnSelectSearchField
)
176 ON_COMMAND(ID_LOGDLG_FIND
, &CLogDlg::OnFind
)
177 ON_COMMAND(ID_LOGDLG_FOCUSFILTER
, &CLogDlg::OnFocusFilter
)
178 ON_COMMAND(ID_EDIT_COPY
, &CLogDlg::OnEditCopy
)
179 ON_MESSAGE(MSG_REFLOG_CHANGED
, OnRefLogChanged
)
180 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED
, OnTaskbarBtnCreated
)
182 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED
, &CLogDlg::OnFileListCtrlItemChanged
)
192 JumpType_AuthorEmail
,
193 JumpType_CommitterEmail
,
204 void CLogDlg::SetParams(const CTGitPath
& orgPath
, const CTGitPath
& path
, CString hightlightRevision
, CString range
, DWORD limit
, int limitScale
/*=-1*/)
208 m_hightlightRevision
= hightlightRevision
;
210 if (range
== GIT_REV_ZERO
)
213 if (!(range
.IsEmpty() || range
== _T("HEAD")))
214 m_bAllBranch
= BST_UNCHECKED
;
218 if (limitScale
== CFilterData::SHOW_NO_LIMIT
|| (!range
.IsEmpty() && m_LogList
.m_Filter
.m_NumberOfLogsScale
!= CFilterData::SHOW_LAST_N_COMMITS
))
219 m_LogList
.m_Filter
.m_NumberOfLogsScale
= CFilterData::SHOW_NO_LIMIT
;
220 if (limitScale
>= CFilterData::SHOW_LAST_N_COMMITS
&& limit
> 0)
222 // limitation from command line argument, so override the filter.
223 m_LogList
.m_Filter
.m_NumberOfLogs
= limit
;
224 m_LogList
.m_Filter
.m_NumberOfLogsScale
= limitScale
;
227 if (::IsWindow(m_hWnd
))
231 void CLogDlg::SetFilter(const CString
& findstr
, LONG findtype
, bool findregex
)
233 m_LogList
.m_sFilterText
= findstr
;
235 m_LogList
.m_SelectedFilters
= findtype
;
236 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
= findregex
;
239 BOOL
CLogDlg::OnInitDialog()
242 CResizableStandAloneDialog::OnInitDialog();
243 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
245 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
246 // do this, Explorer would be unable to send that message to our window if we
247 // were running elevated. It's OK to make the call all the time, since if we're
248 // not elevated, this is a no-op.
249 CHANGEFILTERSTRUCT cfs
= { sizeof(CHANGEFILTERSTRUCT
) };
250 typedef BOOL STDAPICALLTYPE
ChangeWindowMessageFilterExDFN(HWND hWnd
, UINT message
, DWORD action
, PCHANGEFILTERSTRUCT pChangeFilterStruct
);
251 CAutoLibrary hUser
= AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
254 ChangeWindowMessageFilterExDFN
*pfnChangeWindowMessageFilterEx
= (ChangeWindowMessageFilterExDFN
*)GetProcAddress(hUser
, "ChangeWindowMessageFilterEx");
255 if (pfnChangeWindowMessageFilterEx
)
257 pfnChangeWindowMessageFilterEx(m_hWnd
, WM_TASKBARBTNCREATED
, MSGFLT_ALLOW
, &cfs
);
260 m_pTaskbarList
.Release();
261 if (FAILED(m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
)))
262 m_pTaskbarList
= nullptr;
264 m_hAccel
= LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG
));
266 // use the state of the "stop on copy/rename" option from the last time
269 // set the font to use in the log message view, configured in the settings dialog
270 CAppUtils::CreateFontForLogs(m_logFont
);
271 GetDlgItem(IDC_MSGVIEW
)->SetFont(&m_logFont
);
272 // make the log message rich edit control send a message when the mouse pointer is over a link
273 GetDlgItem(IDC_MSGVIEW
)->SendMessage(EM_SETEVENTMASK
, NULL
, ENM_LINK
| ENM_SCROLL
);
275 // "unrelated paths" should be in gray color
278 // set up the columns
279 m_LogList
.DeleteAllItems();
281 m_LogList
.m_Path
=m_path
;
282 m_LogList
.m_hasWC
= m_LogList
.m_bShowWC
= !GitAdminDir::IsBareRepo(g_Git
.m_CurrentDir
);
283 m_LogList
.InsertGitColumn();
286 m_LogList
.m_Path
.Reset();
288 m_ChangedFileListCtrl
.Init(GITSLC_COLEXT
| GITSLC_COLSTATUS
|GITSLC_COLADD
|GITSLC_COLDEL
, _T("LogDlg"), (GITSLC_POPALL
^ (GITSLC_POPIGNORE
|GITSLC_POPRESTORE
)), false, m_LogList
.m_hasWC
, GITSLC_COLEXT
| GITSLC_COLSTATUS
| GITSLC_COLADD
| GITSLC_COLDEL
);
290 GetDlgItem(IDC_LOGLIST
)->UpdateData(FALSE
);
294 CheckRegexpTooltip();
298 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
299 m_cFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
);
300 m_cFilter
.SetInfoIcon(IDI_LOGFILTER
);
301 m_cFilter
.SetValidator(this);
303 AdjustControlSize(IDC_LOG_ALLBRANCH
);
304 AdjustControlSize(IDC_WHOLE_PROJECT
);
306 GetClientRect(m_DlgOrigRect
);
307 m_LogList
.GetClientRect(m_LogListOrigRect
);
308 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(m_MsgViewOrigRect
);
309 m_ChangedFileListCtrl
.GetClientRect(m_ChgOrigRect
);
311 m_Brush
.CreateSolidBrush(RGB(174, 200, 255));
313 m_DateFrom
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
|MCS_NOTODAY
|MCS_NOTRAILINGDATES
|MCS_NOSELCHANGEONNAV
);
314 m_DateTo
.SendMessage(DTM_SETMCSTYLE
, 0, MCS_WEEKNUMBERS
| MCS_NOTRAILINGDATES
| MCS_NOSELCHANGEONNAV
);
316 m_staticRef
.SetURL(CString());
321 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_LOCAL_BRANCHES
;
322 if (m_bAllBranch
== BST_CHECKED
)
323 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
324 else if (m_bAllBranch
== BST_INDETERMINATE
)
325 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
327 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_ALL_BRANCH
;
329 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
330 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
331 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
333 // SetPromptParentWindow(m_hWnd);
334 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL
)));
335 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL
)));
336 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT
)));
337 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1
)));
338 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2
)));
339 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG
)));
340 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF
)));
341 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH
)));
342 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH_FF
)));
343 m_JumpType
.AddString(CString(MAKEINTRESOURCE(IDS_PROC_SELECTION_HISTORY
)));
344 m_JumpType
.SetCurSel(0);
345 m_JumpUp
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
346 m_JumpDown
.SetIcon((HICON
)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN
), IMAGE_ICON
, 16, 16, LR_DEFAULTCOLOR
));
349 CenterWindow(CWnd::FromHandle(hWndExplorer
));
350 EnableSaveRestore(_T("LogDlg"));
352 DWORD yPos1
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
353 DWORD yPos2
= CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
354 RECT rcDlg
, rcLogList
, rcChgMsg
;
355 GetClientRect(&rcDlg
);
356 m_LogList
.GetWindowRect(&rcLogList
);
357 ScreenToClient(&rcLogList
);
358 m_ChangedFileListCtrl
.GetWindowRect(&rcChgMsg
);
359 ScreenToClient(&rcChgMsg
);
360 if (yPos1
&& ((LONG
)yPos1
< rcDlg
.bottom
- 185))
363 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
364 ScreenToClient(&rectSplitter
);
365 int delta
= yPos1
- rectSplitter
.top
;
367 if ((rcLogList
.bottom
+ delta
> rcLogList
.top
)&&(rcLogList
.bottom
+ delta
< rcChgMsg
.bottom
- 30))
369 m_wndSplitter1
.SetWindowPos(NULL
, rectSplitter
.left
, yPos1
, 0, 0, SWP_NOSIZE
);
373 if (yPos2
&& ((LONG
)yPos2
< rcDlg
.bottom
- 153))
376 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
377 ScreenToClient(&rectSplitter
);
378 int delta
= yPos2
- rectSplitter
.top
;
380 if ((rcChgMsg
.top
+ delta
< rcChgMsg
.bottom
)&&(rcChgMsg
.top
+ delta
> rcLogList
.top
+ 30))
382 m_wndSplitter2
.SetWindowPos(NULL
, rectSplitter
.left
, yPos2
, 0, 0, SWP_NOSIZE
);
391 // the dialog is used to select revisions
392 // enable the OK button if appropriate
397 // the dialog is used to just view log messages
398 // hide the OK button and set text on Cancel button to OK
399 GetDlgItemText(IDOK
, temp
);
400 SetDlgItemText(IDCANCEL
, temp
);
401 GetDlgItem(IDOK
)->ShowWindow(SW_HIDE
);
404 // first start a thread to obtain the log messages without
405 // blocking the dialog
407 //m_tFrom = (DWORD)-1;
409 // scroll to user selected or current revision
410 if (m_hightlightRevision
.IsEmpty() || g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, m_hightlightRevision
))
412 if (g_Git
.GetHash(m_LogList
.m_lastSelectedHash
, _T("HEAD")))
413 MessageBox(g_Git
.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR
);
416 if (g_Git
.GetConfigValueBool(_T("tgit.logshowpatch")))
419 m_LogList
.FetchLogAsync(this);
423 m_cFileFilter
.SetCancelBitmaps(IDI_CANCELNORMAL
, IDI_CANCELPRESSED
);
424 m_cFileFilter
.SetInfoIcon(IDI_FILTEREDIT
);
425 temp
.LoadString(IDS_FILEDIFF_FILTERCUE
);
426 temp
= _T(" ") + temp
;
427 m_cFileFilter
.SetCueBanner(temp
);
429 GetDlgItem(IDC_LOGLIST
)->SetFocus();
431 m_History
.SetMaxHistoryItems((LONG
)CRegDWORD(_T("Software\\TortoiseGit\\MaxRefHistoryItems"), 5));
433 reg
.Format(_T("Software\\TortoiseGit\\History\\log-refs\\%s"), (LPCTSTR
)g_Git
.m_CurrentDir
);
434 reg
.Replace(_T(':'),_T('_'));
435 m_History
.Load(reg
, _T("ref"));
437 reg
.Format(_T("Software\\TortoiseGit\\History\\LogDlg_Limits\\%s\\FromDate"), (LPCTSTR
)g_Git
.m_CurrentDir
);
438 reg
.Replace(_T(':'), _T('_'));
439 m_regLastSelectedFromDate
= CRegString(reg
);
445 HBRUSH
CLogDlg::OnCtlColor(CDC
* pDC
, CWnd
* pWnd
, UINT nCtlColor
)
447 HBRUSH hbr
= __super::OnCtlColor(pDC
, pWnd
, nCtlColor
);
449 if ((m_LogList
.m_Filter
.m_NumberOfLogsScale
>= CFilterData::SHOW_LAST_N_COMMITS
|| m_LogList
.m_Filter
.m_NumberOfLogsScale
== CFilterData::SHOW_LAST_SEL_DATE
&& m_LogList
.m_Filter
.m_From
!= -1) && pWnd
->GetDlgCtrlID() == IDC_FROMLABEL
)
451 pDC
->SetBkMode(TRANSPARENT
);
458 void CLogDlg::OnPaint()
462 if (!(m_LogList
.m_Filter
.m_NumberOfLogsScale
>= CFilterData::SHOW_LAST_N_COMMITS
|| m_LogList
.m_Filter
.m_NumberOfLogsScale
== CFilterData::SHOW_LAST_SEL_DATE
&& m_LogList
.m_Filter
.m_From
!= -1))
465 CWnd
* pWnd
= GetDlgItem(IDC_FROMLABEL
);
470 pWnd
->GetWindowRect(&rect
);
471 ScreenToClient(rect
);
476 dc
.FillRect(rect
, &m_Brush
);
479 LRESULT
CLogDlg::OnLogListLoading(WPARAM wParam
, LPARAM
/*lParam*/)
483 if( cur
== GITLOG_START
)
486 temp
.LoadString(IDS_PROGRESSWAIT
);
488 this->m_LogList
.ShowText(temp
, true);
490 // We use a progress bar while getting the logs
491 m_LogProgress
.SetRange32(0, 100);
492 m_LogProgress
.SetPos(0);
495 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
496 m_pTaskbarList
->SetProgressValue(m_hWnd
, 0, 100);
499 GetDlgItem(IDC_WALKBEHAVIOUR
)->ShowWindow(SW_HIDE
);
500 GetDlgItem(IDC_VIEW
)->ShowWindow(SW_HIDE
);
501 GetDlgItem(IDC_STATBUTTON
)->ShowWindow(SW_HIDE
);
502 GetDlgItem(IDC_PROGRESS
)->ShowWindow(TRUE
);
504 DialogEnableWindow(IDC_WALKBEHAVIOUR
, FALSE
);
505 DialogEnableWindow(IDC_STATBUTTON
, FALSE
);
506 //DialogEnableWindow(IDC_REFRESH, FALSE);
507 DialogEnableWindow(IDC_VIEW
, FALSE
);
510 else if( cur
== GITLOG_END
)
512 if(this->m_LogList
.HasText())
514 this->m_LogList
.ClearText();
516 UpdateLogInfoLabel();
519 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NOPROGRESS
);
521 DialogEnableWindow(IDC_WHOLE_PROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
523 DialogEnableWindow(IDC_STATBUTTON
, !(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
));
524 DialogEnableWindow(IDC_REFRESH
, TRUE
);
525 DialogEnableWindow(IDC_VIEW
, TRUE
);
526 DialogEnableWindow(IDC_WALKBEHAVIOUR
, TRUE
);
527 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
528 GetDlgItem(IDC_WALKBEHAVIOUR
)->ShowWindow(SW_SHOW
);
529 GetDlgItem(IDC_VIEW
)->ShowWindow(SW_SHOW
);
530 GetDlgItem(IDC_STATBUTTON
)->ShowWindow(SW_SHOW
);
531 GetDlgItem(IDC_PROGRESS
)->ShowWindow(FALSE
);
532 //CTime time=m_LogList.GetOldestTime();
534 m_LogList
.GetTimeRange(begin
,end
);
536 if (m_LogList
.m_Filter
.m_From
> 0 && m_LogList
.m_Filter
.m_NumberOfLogsScale
>= CFilterData::SHOW_LAST_SEL_DATE
)
537 begin
= m_LogList
.m_Filter
.m_From
;
538 m_DateFrom
.SetTime(&begin
);
539 if (m_LogList
.m_Filter
.m_To
!= -1)
540 end
= m_LogList
.m_Filter
.m_To
;
541 m_DateTo
.SetTime(&end
);
546 if(this->m_LogList
.HasText())
548 this->m_LogList
.ClearText();
549 this->m_LogList
.Invalidate();
551 UpdateLogInfoLabel();
552 m_LogProgress
.SetPos(cur
);
555 m_pTaskbarList
->SetProgressState(m_hWnd
, TBPF_NORMAL
);
556 m_pTaskbarList
->SetProgressValue(m_hWnd
, cur
, 100);
561 void CLogDlg::SetDlgTitle()
563 if (m_sTitle
.IsEmpty())
564 GetWindowText(m_sTitle
);
566 if (m_LogList
.m_Path
.IsEmpty() || m_orgPath
.GetWinPathString().IsEmpty())
568 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, m_sTitle
);
571 CAppUtils::SetWindowTitle(m_hWnd
, m_orgPath
.GetWinPathString(), m_sTitle
);
574 void CLogDlg::CheckRegexpTooltip()
576 CWnd
*pWnd
= GetDlgItem(IDC_SEARCHEDIT
);
577 // Since tooltip describes regexp features, show it only if regexps are enabled.
578 if (m_bFilterWithRegex
)
580 m_tooltips
.AddTool(pWnd
, IDS_LOG_FILTER_REGEX_TT
);
583 m_tooltips
.DelTool(pWnd
);
586 void CLogDlg::EnableOKButton()
590 // the dialog is used to select revisions
591 if (m_bSelectionMustBeSingle
)
593 // enable OK button if only a single revision is selected
594 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()==1));
596 else if (m_bSelectionMustBeContinuous
)
597 DialogEnableWindow(IDOK
, (m_LogList
.GetSelectedCount()!=0)&&(m_LogList
.IsSelectionContinuous()));
599 DialogEnableWindow(IDOK
, m_LogList
.GetSelectedCount()!=0);
602 DialogEnableWindow(IDOK
, TRUE
);
605 bool LookLikeGitHash(const CString
& msg
, int &pos
)
608 for (; pos
< msg
.GetLength(); ++pos
)
610 if (msg
[pos
] >= '0' && msg
[pos
] <= '9' || msg
[pos
] >= 'a' && msg
[pos
] <= 'f')
616 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2 && msg
[pos
] != '@';
619 return c
>= g_Git
.GetShortHASHLength() && c
<= GIT_HASH_SIZE
* 2;
622 std::vector
<CHARRANGE
> FindGitHashPositions(const CString
& msg
, int offset
)
624 std::vector
<CHARRANGE
> result
;
625 offset
= offset
< 0 ? 0 : offset
;
627 while (offset
< msg
.GetLength())
630 TCHAR e
= msg
[offset
];
634 if (msg
.Mid(offset
, 11) == _T("git-svn-id:")
635 || msg
.Mid(offset
, 14) == _T("Signed-off-by:")
636 || msg
.Mid(offset
, 10) == _T("Change-Id:")
640 while (offset
< msg
.GetLength())
642 if (msg
[++offset
] == '\n')
648 else if (e
>= 'A' && e
<= 'Z' || e
>= 'h' && e
<= 'z')
653 } while (offset
< msg
.GetLength() && (e
>= 'A' && e
<= 'Z' || e
>= 'a' && e
<= 'z' || e
>= '0' && e
<= '9'));
655 else if (e
>= 'a' && e
<= 'g' || e
>= '0' && e
<= '9')
662 if (LookLikeGitHash(msg
, offset
))
664 TCHAR d
= offset
< msg
.GetLength() ? msg
[offset
] : '\0';
665 if (!((d
>= 'A' && d
<= 'Z') || (d
>= 'a' && d
<= 'z') || (d
>= '0' && d
<= '9')))
667 CHARRANGE range
= { old
, offset
};
668 result
.push_back(range
);
682 BOOL
FindGitHash(const CString
& msg
, int offset
, CWnd
*pWnd
)
684 std::vector
<CHARRANGE
> positions
= FindGitHashPositions(msg
, offset
);
685 CAppUtils::SetCharFormat(pWnd
, CFM_LINK
, CFE_LINK
, positions
);
687 return positions
.empty() ? FALSE
: TRUE
;
690 static int DescribeCommit(CGitHash
& hash
, CString
& result
)
692 CAutoRepository
repo(g_Git
.GetGitRepository());
696 if (git_object_lookup(commit
.GetPointer(), repo
, (const git_oid
*)hash
.m_hash
, GIT_OBJ_COMMIT
))
699 CAutoDescribeResult describe
;
700 git_describe_options describe_options
= GIT_DESCRIBE_OPTIONS_INIT
;
701 describe_options
.describe_strategy
= CRegDWORD(_T("Software\\TortoiseGit\\DescribeStrategy"), GIT_DESCRIBE_DEFAULT
);
702 if (git_describe_commit(describe
.GetPointer(), (git_object
*)commit
, &describe_options
))
705 CAutoBuf describe_buf
;
706 git_describe_format_options format_options
= GIT_DESCRIBE_FORMAT_OPTIONS_INIT
;
707 format_options
.abbreviated_size
= CRegDWORD(_T("Software\\TortoiseGit\\DescribeAbbreviatedSize"), GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE
);
708 format_options
.always_use_long_format
= CRegDWORD(_T("Software\\TortoiseGit\\DescribeAlwaysLong"));
709 if (git_describe_format(describe_buf
, describe
, &format_options
))
712 result
= CUnicodeUtils::GetUnicode(describe_buf
->ptr
);
716 void CLogDlg::FillLogMessageCtrl(bool bShow
/* = true*/)
718 // we fill here the log message rich edit control,
719 // and also populate the changed files list control
720 // according to the selected revision(s).
722 CRichEditCtrl
* pMsgView
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
723 // empty the log message view
724 pMsgView
->SetWindowText(_T(" "));
726 // empty the changed files list
727 m_ChangedFileListCtrl
.SetRedraw(FALSE
);
728 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
729 m_ChangedFileListCtrl
.DeleteAllItems();
731 // if we're not here to really show a selected revision, just
732 // get out of here after clearing the views, which is what is intended
733 // if that flag is not set.
737 m_ChangedFileListCtrl
.Invalidate();
738 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
739 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
740 m_gravatar
.LoadGravatar();
744 // depending on how many revisions are selected, we have to do different
746 int selCount
= m_LogList
.GetSelectedCount();
749 // if nothing is selected, we have nothing more to do
750 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
751 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
752 m_gravatar
.LoadGravatar();
755 else if (selCount
== 1)
757 // if one revision is selected, we have to fill the log message view
758 // with the corresponding log message, and also fill the changed files
760 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
761 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
762 if (selIndex
>= m_LogList
.m_arShownList
.GetCount())
764 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
765 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
768 Locker
lock(m_LogList
.m_critSec_AsyncDiff
);
769 GitRevLoglist
* pLogEntry
= reinterpret_cast<GitRevLoglist
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
772 CString out_describe
;
776 if (!DescribeCommit(pLogEntry
->m_CommitHash
, result
))
777 out_describe
= _T("Describe: ") + result
+ _T("\r\n");
780 // set the log message text
781 pMsgView
->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH
)) + _T(": ") + pLogEntry
->m_CommitHash
.ToString() + _T("\r\n") + out_describe
+ _T("\r\n"));
782 // turn bug ID's into links if the bugtraq: properties have been set
783 // and we can find a match of those in the log message
785 pMsgView
->SetSel(-1,-1);
786 CAppUtils::SetCharFormat(pMsgView
, CFM_BOLD
, CFE_BOLD
);
788 CString msg
= m_bAsteriskLogPrefix
? _T("* ") : _T("");
789 msg
+=pLogEntry
->GetSubject();
790 pMsgView
->ReplaceSel(msg
);
792 pMsgView
->SetSel(-1,-1);
793 CAppUtils::SetCharFormat(pMsgView
, CFM_BOLD
, 0);
796 msg
+=pLogEntry
->GetBody();
798 if(!pLogEntry
->m_Notes
.IsEmpty())
800 msg
+= _T("\n*") + CString(MAKEINTRESOURCE(IDS_NOTES
)) + _T("* ");
801 msg
+= pLogEntry
->m_Notes
;
805 CString tagInfo
= m_LogList
.GetTagInfo(pLogEntry
);
806 if(!tagInfo
.IsEmpty())
807 tagInfo
= _T("\n*") + CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO
)) + _T("*\n\n") + tagInfo
;
810 pMsgView
->ReplaceSel(msg
);
813 pMsgView
->GetWindowText(text
);
814 // the rich edit control doesn't count the CR char!
815 // to be exact: CRLF is treated as one char.
818 int findHashStart
= text
.Find('\n');
819 if (!out_describe
.IsEmpty())
820 findHashStart
= text
.Find('\n', findHashStart
+ 1);
821 FindGitHash(text
, findHashStart
, pMsgView
);
822 m_LogList
.m_ProjectProperties
.FindBugID(text
, pMsgView
);
823 CAppUtils::StyleURLs(text
, pMsgView
);
824 if (((DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\StyleCommitMessages"), TRUE
)) == TRUE
)
825 CAppUtils::FormatTextInRichEditControl(pMsgView
);
830 pMsgView
->SendMessage(EM_EXSETSEL
, NULL
, (LPARAM
)&range
);
832 CString matchpath
=this->m_path
.GetGitPathString();
834 CTGitPathList
& files
= pLogEntry
->GetFiles(&m_LogList
);
835 int count
= files
.GetCount();
836 if (!m_bWholeProject
&& !matchpath
.IsEmpty() && m_iHidePaths
)
838 int matchPathLen
= matchpath
.GetLength();
839 bool somethingHidden
= false;
840 for (int i
= 0; i
< count
; ++i
)
842 ((CTGitPath
&)files
[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
| CTGitPath::LOGACTIONS_GRAY
);
844 if (files
[i
].GetGitPathString().Left(matchPathLen
) != matchpath
&& ((files
[i
].m_Action
& (CTGitPath::LOGACTIONS_REPLACED
| CTGitPath::LOGACTIONS_COPY
)) == 0 || files
[i
].GetGitOldPathString().Left(matchPathLen
) != matchpath
))
846 somethingHidden
= true;
847 if (m_iHidePaths
== 1)
848 ((CTGitPath
&)files
[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
849 else if (m_iHidePaths
== 2)
850 ((CTGitPath
&)files
[i
]).m_Action
|= CTGitPath::LOGACTIONS_GRAY
;
854 pLogEntry
->GetAction(&m_LogList
) |= CTGitPath::LOGACTIONS_HIDE
;
856 pLogEntry
->GetAction(&m_LogList
) &= ~CTGitPath::LOGACTIONS_HIDE
;
858 else if (pLogEntry
->GetAction(&m_LogList
) & CTGitPath::LOGACTIONS_HIDE
)
860 pLogEntry
->GetAction(&m_LogList
) &= ~CTGitPath::LOGACTIONS_HIDE
;
861 for (int i
= 0 ; i
< count
; ++i
)
862 ((CTGitPath
&)files
[i
]).m_Action
&= ~(CTGitPath::LOGACTIONS_HIDE
| CTGitPath::LOGACTIONS_GRAY
);
866 m_cFileFilter
.GetWindowText(fileFilter
);
867 if (!fileFilter
.IsEmpty())
869 fileFilter
.MakeLower();
870 bool somethingHidden
= false;
871 for (int i
= 0; i
< count
; ++i
)
873 CString
sPath(files
[i
].GetGitPathString());
875 if (sPath
.Find(fileFilter
) < 0)
877 ((CTGitPath
&)files
[i
]).m_Action
|= CTGitPath::LOGACTIONS_HIDE
;
878 somethingHidden
= true;
882 pLogEntry
->GetAction(&m_LogList
) |= CTGitPath::LOGACTIONS_HIDE
;
885 m_ChangedFileListCtrl
.UpdateWithGitPathList(pLogEntry
->GetFiles(&m_LogList
));
886 m_ChangedFileListCtrl
.m_CurrentVersion
=pLogEntry
->m_CommitHash
;
887 if (pLogEntry
->m_CommitHash
.IsEmpty() && m_bShowUnversioned
)
889 m_ChangedFileListCtrl
.UpdateUnRevFileList(pLogEntry
->GetUnRevFiles());
890 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
| GITSLC_SHOWUNVERSIONED
);
893 m_ChangedFileListCtrl
.Show(GITSLC_SHOWVERSIONED
);
895 m_ChangedFileListCtrl
.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES
)));
897 if(!pLogEntry
->m_IsDiffFiles
)
898 m_ChangedFileListCtrl
.SetBusy(TRUE
);
900 m_ChangedFileListCtrl
.SetBusy(FALSE
);
902 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
903 m_gravatar
.LoadGravatar(pLogEntry
->GetAuthorEmail());
910 // more than one revision is selected:
911 // the log message view must be emptied
912 // the changed files list contains all the changed paths from all
913 // selected revisions, with 'doubles' removed
914 m_gravatar
.LoadGravatar();
918 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
920 // sort according to the settings
921 if (m_nSortColumnPathList
> 0)
922 SetSortArrow(&m_ChangedFileListCtrl
, m_nSortColumnPathList
, m_bAscendingPathList
);
924 SetSortArrow(&m_ChangedFileListCtrl
, -1, false);
925 m_ChangedFileListCtrl
.SetRedraw(TRUE
);
929 void CLogDlg::FillPatchView(bool onlySetTimer
)
931 if (!::IsWindow(this->m_patchViewdlg
.m_hWnd
))
934 KillTimer(LOG_FILLPATCHVTIMER
);
937 SetTimer(LOG_FILLPATCHVTIMER
, 100, nullptr);
941 POSITION posLogList
= m_LogList
.GetFirstSelectedItemPosition();
942 if (posLogList
== nullptr)
944 m_patchViewdlg
.ClearView();
945 return; // nothing is selected, get out of here
948 GitRev
* pLogEntry
= reinterpret_cast<GitRev
* >(m_LogList
.m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(posLogList
)));
949 if (pLogEntry
== nullptr || m_LogList
.GetNextSelectedItem(posLogList
) != -1)
951 m_patchViewdlg
.ClearView();
955 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
961 if (CAppUtils::GetMsysgitVersion() > 0x01080100)
962 diffContext
= g_Git
.GetConfigValueInt32(_T("diff.context"), -1);
964 CString rev1
= pLogEntry
->m_CommitHash
.IsEmpty() ? _T("HEAD") : (pLogEntry
->m_CommitHash
.ToString() + _T("~1"));
965 CString rev2
= pLogEntry
->m_CommitHash
.IsEmpty() ? GIT_REV_ZERO
: pLogEntry
->m_CommitHash
.ToString();
966 g_Git
.GetUnifiedDiff(CTGitPath(), rev1
, rev2
, &outA
, false, false, diffContext
);
967 out
= CUnicodeUtils::GetUnicode(outA
);
973 int nSelect
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
974 CTGitPath
* p
= (CTGitPath
*)m_ChangedFileListCtrl
.GetItemData(nSelect
);
975 if (p
&& !(p
->m_Action
&CTGitPath::LOGACTIONS_UNVER
))
978 if (pLogEntry
->m_CommitHash
.IsEmpty())
979 cmd
.Format(_T("git.exe diff HEAD -- \"%s\""), (LPCTSTR
)p
->GetGitPathString());
981 cmd
.Format(_T("git.exe diff %s^%d..%s -- \"%s\""), (LPCTSTR
)pLogEntry
->m_CommitHash
.ToString(), p
->m_ParentNo
+ 1, (LPCTSTR
)pLogEntry
->m_CommitHash
.ToString(), (LPCTSTR
)p
->GetGitPathString());
982 g_Git
.Run(cmd
, &out
, CP_UTF8
);
987 m_patchViewdlg
.SetText(out
);
990 void CLogDlg::TogglePatchView()
992 m_patchViewdlg
.m_ParentDlg
= this;
993 if (!IsWindow(m_patchViewdlg
.m_hWnd
))
995 BOOL viewPatchEnabled
= FALSE
;
996 viewPatchEnabled
= g_Git
.GetConfigValueBool(_T("tgit.logshowpatch"));
997 if (viewPatchEnabled
== FALSE
)
998 g_Git
.SetConfigValue(_T("tgit.logshowpatch"), _T("true"));
999 m_patchViewdlg
.Create(IDD_PATCH_VIEW
, this);
1000 m_patchViewdlg
.m_ctrlPatchView
.Call(SCI_SETSCROLLWIDTHTRACKING
, TRUE
);
1002 this->GetWindowRect(&rect
);
1004 m_patchViewdlg
.ShowWindow(SW_SHOW
);
1005 m_patchViewdlg
.SetWindowPos(nullptr, rect
.right
, rect
.top
, rect
.Width(), rect
.Height(), SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOZORDER
);
1011 g_Git
.SetConfigValue(_T("tgit.logshowpatch"), _T("false"));
1012 m_patchViewdlg
.ShowWindow(SW_HIDE
);
1013 m_patchViewdlg
.DestroyWindow();
1017 LRESULT
CLogDlg::OnFileListCtrlItemChanged(WPARAM
/*wparam*/, LPARAM
/*lparam*/)
1019 FillPatchView(true);
1023 void CLogDlg::OnMoving(UINT fwSide
, LPRECT pRect
)
1025 __super::OnMoving(fwSide
, pRect
);
1027 if (!::IsWindow(m_patchViewdlg
.m_hWnd
))
1031 m_patchViewdlg
.GetWindowRect(&patchrect
);
1032 if (!::IsWindow(m_hWnd
))
1036 GetWindowRect(&thisrect
);
1037 if (patchrect
.left
== thisrect
.right
)
1039 m_patchViewdlg
.SetWindowPos(nullptr, patchrect
.left
- (thisrect
.left
- pRect
->left
), patchrect
.top
- (thisrect
.top
- pRect
->top
), 0, 0, SWP_NOACTIVATE
| SWP_NOOWNERZORDER
| SWP_NOSIZE
| SWP_NOZORDER
);
1043 void CLogDlg::OnSizing(UINT fwSide
, LPRECT pRect
)
1045 __super::OnSizing(fwSide
, pRect
);
1047 if (!::IsWindow(this->m_patchViewdlg
.m_hWnd
))
1050 CRect thisrect
, patchrect
;
1051 this->GetWindowRect(thisrect
);
1052 this->m_patchViewdlg
.GetWindowRect(patchrect
);
1053 if (thisrect
.right
!= patchrect
.left
)
1056 patchrect
.left
-= (thisrect
.right
- pRect
->right
);
1057 patchrect
.right
-= (thisrect
.right
- pRect
->right
);
1059 if (patchrect
.bottom
== thisrect
.bottom
)
1060 patchrect
.bottom
-= (thisrect
.bottom
- pRect
->bottom
);
1061 if (patchrect
.top
== thisrect
.top
)
1062 patchrect
.top
-= thisrect
.top
- pRect
->top
;
1063 m_patchViewdlg
.MoveWindow(patchrect
);
1066 void CLogDlg::OnSelectSearchField()
1068 m_cFilter
.SetSel(0, -1, FALSE
);
1069 m_cFilter
.SetFocus();
1072 void CLogDlg::GoBack()
1074 GoBackForward(false, false);
1077 void CLogDlg::GoForward()
1079 GoBackForward(false, true);
1082 void CLogDlg::GoBackAndSelect()
1084 GoBackForward(true, false);
1087 void CLogDlg::GoForwardAndSelect()
1089 GoBackForward(true, true);
1092 void CLogDlg::GoBackForward(bool select
, bool bForward
)
1094 m_LogList
.m_highlight
.Empty();
1096 if (bForward
? m_LogList
.m_selectionHistory
.GoForward(gotoHash
) : m_LogList
.m_selectionHistory
.GoBack(gotoHash
))
1099 for (i
= 0; i
< m_LogList
.m_arShownList
.GetCount(); ++i
)
1101 GitRev
*rev
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1103 if (rev
->m_CommitHash
== gotoHash
)
1105 m_LogList
.EnsureVisible(i
, FALSE
);
1108 m_LogList
.m_highlight
.Empty();
1109 m_LogList
.SetItemState(m_LogList
.GetSelectionMark(), 0, LVIS_SELECTED
| LVIS_FOCUSED
);
1110 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1113 int index
= m_LogList
.GetNextSelectedItem(pos
);
1115 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1117 m_bNavigatingWithSelect
= true;
1118 m_LogList
.SetItemState(i
, LVIS_SELECTED
| LVIS_FOCUSED
, LVIS_SELECTED
| LVIS_FOCUSED
);
1119 m_LogList
.SetSelectionMark(i
);
1120 m_bNavigatingWithSelect
= false;
1123 m_LogList
.m_highlight
= gotoHash
;
1124 m_LogList
.Invalidate();
1128 if (i
== m_LogList
.m_arShownList
.GetCount())
1131 msg
.Format(IDS_LOG_NOT_VISIBLE
, (LPCTSTR
)gotoHash
.ToString());
1132 MessageBox(msg
, _T("TortoiseGit"), MB_OK
| MB_ICONINFORMATION
);
1136 PlaySound((LPCTSTR
)SND_ALIAS_SYSTEMASTERISK
, nullptr, SND_ASYNC
| SND_ALIAS_ID
);
1139 void CLogDlg::OnBnClickedRefresh()
1144 void CLogDlg::Refresh (bool clearfilter
/*autoGoOnline*/)
1146 m_LogList
.Refresh(clearfilter
);
1149 FillLogMessageCtrl(false);
1154 BOOL
CLogDlg::Cancel()
1156 return m_bCancelled
;
1159 void CLogDlg::SaveSplitterPos()
1163 CRegDWORD
regPos1(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
1164 CRegDWORD
regPos2(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
1166 m_wndSplitter1
.GetWindowRect(&rectSplitter
);
1167 ScreenToClient(&rectSplitter
);
1168 regPos1
= rectSplitter
.top
;
1169 m_wndSplitter2
.GetWindowRect(&rectSplitter
);
1170 ScreenToClient(&rectSplitter
);
1171 regPos2
= rectSplitter
.top
;
1175 void CLogDlg::OnCancel()
1177 this->ShowWindow(SW_HIDE
);
1179 // canceling means stopping the working thread if it's still running.
1180 m_LogList
.SafeTerminateAsyncDiffThread();
1181 if (this->IsThreadRunning())
1183 m_LogList
.SafeTerminateThread();
1188 __super::OnCancel();
1191 void CLogDlg::CopyChangedSelectionToClipBoard()
1194 POSITION posLogList
= m_LogList
.GetFirstSelectedItemPosition();
1195 if (posLogList
== nullptr)
1196 return; // nothing is selected, get out of here
1200 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1203 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1206 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1207 CTGitPath
*path
= (CTGitPath
*)m_ChangedFileListCtrl
.GetItemData(nItem
);
1209 sPaths
+= path
->GetGitPathString();
1210 sPaths
+= _T("\r\n");
1216 // only one revision is selected in the log dialog top pane
1217 // but multiple items could be selected in the changed items list
1218 POSITION pos
= m_ChangedFileListCtrl
.GetFirstSelectedItemPosition();
1221 int nItem
= m_ChangedFileListCtrl
.GetNextSelectedItem(pos
);
1222 LogChangedPath
* changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(nItem
);
1224 if ((m_cHidePaths
.GetState() & 0x0003)==BST_CHECKED
)
1226 // some items are hidden! So find out which item the user really selected
1227 INT_PTR selRealIndex
= -1;
1228 for (INT_PTR hiddenindex
=0; hiddenindex
<pLogEntry
->pArChangedPaths
->GetCount(); ++hiddenindex
)
1230 if (pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
)->sPath
.Left(m_sRelativeRoot
.GetLength()).Compare(m_sRelativeRoot
)==0)
1232 if (selRealIndex
== nItem
)
1234 changedlogpath
= pLogEntry
->pArChangedPaths
->SafeGetAt(hiddenindex
);
1241 sPaths
+= changedlogpath
->sPath
;
1242 sPaths
+= _T("\r\n");
1248 CStringUtils::WriteAsciiStringToClipboard(sPaths
, GetSafeHwnd());
1252 void CLogDlg::OnContextMenu(CWnd
* pWnd
, CPoint point
)
1254 // we have 4 separate context menus:
1255 // one for the branch label in the upper left
1256 // one for FROM date control
1257 // one shown on the log message list control,
1258 // one shown in the changed-files list control
1259 if (pWnd
== GetDlgItem(IDC_STATIC_REF
))
1262 if (!popup
.CreatePopupMenu())
1266 popup
.AppendMenuIcon(++cnt
, IDS_MENUREFBROWSE
);
1267 popup
.SetDefaultItem(cnt
);
1268 popup
.AppendMenuIcon(++cnt
, _T("HEAD"));
1270 g_Git
.GetHash(fetchHead
, g_Git
.FixBranchName(_T("FETCH_HEAD")));
1271 popup
.AppendMenuIcon(++cnt
, _T("FETCH_HEAD"));
1272 popup
.EnableMenuItem(cnt
, fetchHead
.IsEmpty());
1273 popup
.AppendMenuIcon(++cnt
, IDS_ALL
);
1274 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1275 popup
.AppendMenuIcon(++cnt
, IDS_PROC_LOG_SELECT_LOCAL_BRANCHES
);
1276 popup
.EnableMenuItem(cnt
, m_bFollowRenames
);
1278 if (m_History
.GetCount() > 0)
1280 popup
.AppendMenu(MF_SEPARATOR
, 0);
1281 for (size_t i
= 0; i
< m_History
.GetCount(); ++i
)
1283 CString entry
= m_History
.GetEntry(i
);
1284 if (entry
.GetLength() > 150)
1285 entry
= entry
.Left(150) + _T("...");
1286 popup
.AppendMenuIcon(cnt
++, entry
);
1290 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1295 OnBnClickedBrowseRef();
1299 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
);
1300 m_bAllBranch
= BST_UNCHECKED
;
1303 SetRange(g_Git
.GetCurrentBranch(true));
1307 SetRange(fetchHead
.ToString());
1311 m_bAllBranch
= BST_CHECKED
;
1312 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_ALL_BRANCH
;
1316 m_bAllBranch
= BST_INDETERMINATE
;
1317 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_LOCAL_BRANCHES
;
1319 else if (cmd
>= offset
)
1321 SetRange(m_History
.GetEntry(cmd
- offset
));
1322 m_History
.AddEntry(m_LogList
.m_sRange
);
1329 FillLogMessageCtrl(false);
1334 if (pWnd
== GetDlgItem(IDC_DATEFROM
))
1337 if (!popup
.CreatePopupMenu())
1342 popup
.AppendMenuIcon(++cnt
, IDS_NO_LIMIT
);
1344 DWORD scale
= (DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\NumberOfLogsScale"), CFilterData::SHOW_NO_LIMIT
);
1348 case CFilterData::SHOW_LAST_N_COMMITS
:
1349 strScale
.LoadString(IDS_LAST_N_COMMITS
);
1351 case CFilterData::SHOW_LAST_N_YEARS
:
1352 strScale
.LoadString(IDS_LAST_N_YEARS
);
1354 case CFilterData::SHOW_LAST_N_MONTHS
:
1355 strScale
.LoadString(IDS_LAST_N_MONTHS
);
1357 case CFilterData::SHOW_LAST_N_WEEKS
:
1358 strScale
.LoadString(IDS_LAST_N_WEEKS
);
1361 if (!strScale
.IsEmpty() && m_LogList
.m_Filter
.m_NumberOfLogs
> 0)
1363 popup
.AppendMenu(MF_SEPARATOR
, 0);
1365 number
.Format(L
"%ld", m_LogList
.m_Filter
.m_NumberOfLogs
);
1367 item
.Format(strScale
, (LPCTSTR
)number
);
1368 popup
.AppendMenuIcon(++cnt
, item
);
1371 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1376 m_LogList
.m_Filter
.m_NumberOfLogsScale
= CFilterData::SHOW_NO_LIMIT
;
1377 // reset last selected date
1378 m_regLastSelectedFromDate
.removeValue();
1381 m_LogList
.m_Filter
.m_NumberOfLogsScale
= scale
;
1385 FillLogMessageCtrl(false);
1390 int selCount
= m_LogList
.GetSelectedCount();
1391 if ((selCount
== 1)&&(pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1393 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1396 selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1398 GitRevLoglist
* pRev
= ((GitRevLoglist
*)m_LogList
.m_arShownList
[selIndex
]);
1400 if ((point
.x
== -1) && (point
.y
== -1))
1403 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(&rect
);
1404 ClientToScreen(&rect
);
1405 point
= rect
.CenterPoint();
1407 CString sMenuItemText
;
1409 if (popup
.CreatePopupMenu())
1411 long start
= -1, end
= -1;
1412 auto pEdit
= (CRichEditCtrl
*)GetDlgItem(IDC_MSGVIEW
);
1413 pEdit
->GetSel(start
, end
);
1414 // add the 'default' entries
1415 popup
.AppendMenuIcon(WM_COPY
, IDS_SCIEDIT_COPY
, IDI_COPYCLIP
);
1417 popup
.EnableMenuItem(WM_COPY
, MF_BYCOMMAND
| MF_DISABLED
| MF_GRAYED
);
1418 popup
.AppendMenu(MF_SEPARATOR
);
1419 sMenuItemText
.LoadString(IDS_STATUSLIST_CONTEXT_COPYEXT
);
1420 popup
.AppendMenuIcon(EM_SETSEL
, sMenuItemText
, IDI_COPYCLIP
);
1421 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
1422 sMenuItemText
.LoadString(IDS_EDIT_NOTES
);
1423 popup
.AppendMenuIcon( CGitLogList::ID_EDITNOTE
, sMenuItemText
, IDI_EDIT
);
1425 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1429 break; // no command selected
1432 pEdit
->SetRedraw(FALSE
);
1433 int oldLine
= pEdit
->GetFirstVisibleLine();
1434 pEdit
->SetSel(0, -1);
1436 pEdit
->SetSel(start
, end
);
1437 int newLine
= pEdit
->GetFirstVisibleLine();
1438 pEdit
->LineScroll(oldLine
- newLine
);
1439 pEdit
->SetRedraw(TRUE
);
1440 pEdit
->RedrawWindow();
1444 ::SendMessage(GetDlgItem(IDC_MSGVIEW
)->GetSafeHwnd(), cmd
, 0, -1);
1446 case CGitLogList::ID_EDITNOTE
:
1447 CAppUtils::EditNote(pRev
);
1448 this->FillLogMessageCtrl(true);
1455 void CLogDlg::OnOK()
1457 // since the log dialog is also used to select revisions for other
1458 // dialogs, we have to do some work before closing this dialog
1459 if (GetFocus() != GetDlgItem(IDOK
))
1460 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
1462 m_LogList
.SafeTerminateAsyncDiffThread();
1463 if (this->IsThreadRunning())
1465 m_LogList
.SafeTerminateThread();
1468 // check that one and only one row is selected
1469 if (m_LogList
.GetSelectedCount() == 1)
1471 // get the selected row
1472 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1473 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
1474 if (selIndex
< m_LogList
.m_arShownList
.GetCount())
1476 // all ok, pick up the revision
1477 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
1479 m_sSelectedHash
= pLogEntry
->m_CommitHash
;
1487 if (!GetDlgItem(IDOK
)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL
))
1488 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
1492 GetDlgItemText(IDOK
, buttontext
);
1493 temp
.LoadString(IDS_MSGBOX_CANCEL
);
1494 if (temp
.Compare(buttontext
) != 0)
1495 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
1496 m_bCancelled
= TRUE
;
1497 m_selectedRevs
.Clear();
1498 m_selectedRevsOneRange
.Clear();
1499 if (m_pNotifyWindow
)
1501 int selIndex
= m_LogList
.GetSelectionMark();
1504 PLOGENTRYDATA pLogEntry
= NULL
;
1505 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1506 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1507 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1508 git_revnum_t lowerRev
= pLogEntry
->Rev
;
1509 git_revnum_t higherRev
= lowerRev
;
1512 pLogEntry
= reinterpret_cast<PLOGENTRYDATA
>(m_arShownList
.SafeGetAt(m_LogList
.GetNextSelectedItem(pos
)));
1513 git_revnum_t rev
= pLogEntry
->Rev
;
1514 m_selectedRevs
.AddRevision(pLogEntry
->Rev
);
1517 if (higherRev
< rev
)
1520 if (m_sFilterText
.IsEmpty() && m_nSortColumn
== 0 && IsSelectionContinuous())
1522 m_selectedRevsOneRange
.AddRevRange(lowerRev
, higherRev
);
1524 BOOL bSentMessage
= FALSE
;
1525 if (m_LogList
.GetSelectedCount() == 1)
1527 // if only one revision is selected, check if the path/url with which the dialog was started
1528 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1529 // if it was copied, use the copy from revision as lowerRev
1530 if ((pLogEntry
)&&(pLogEntry
->pArChangedPaths
)&&(lowerRev
== higherRev
))
1532 CString sUrl
= m_path
.GetGitPathString();
1533 if (!m_path
.IsUrl())
1535 sUrl
= GetURLFromPath(m_path
);
1537 sUrl
= sUrl
.Mid(m_sRepositoryRoot
.GetLength());
1538 for (int cp
= 0; cp
< pLogEntry
->pArChangedPaths
->GetCount(); ++cp
)
1540 LogChangedPath
* pData
= pLogEntry
->pArChangedPaths
->SafeGetAt(cp
);
1543 if (sUrl
.Compare(pData
->sPath
) == 0)
1545 if (!pData
->sCopyFromPath
.IsEmpty())
1547 lowerRev
= pData
->lCopyFromRev
;
1548 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
), lowerRev
);
1549 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
), higherRev
);
1550 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1551 bSentMessage
= TRUE
;
1558 if ( !bSentMessage
)
1560 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTSTART
| MERGE_REVSELECTMINUSONE
), lowerRev
);
1561 m_pNotifyWindow
->SendMessage(WM_REVSELECTED
, m_wParam
& (MERGE_REVSELECTEND
| MERGE_REVSELECTMINUSONE
), higherRev
);
1562 m_pNotifyWindow
->SendMessage(WM_REVLIST
, m_selectedRevs
.GetCount(), (LPARAM
)&m_selectedRevs
);
1563 if (m_selectedRevsOneRange
.GetCount())
1564 m_pNotifyWindow
->SendMessage(WM_REVLISTONERANGE
, 0, (LPARAM
)&m_selectedRevsOneRange
);
1569 CRegDWORD
reg(_T("Software\\TortoiseGit\\ShowAllEntry"));
1574 void CLogDlg::OnPasteGitHash()
1576 if (!IsClipboardFormatAvailable(CF_TEXT
))
1579 CClipboardHelper clipboardHelper
;
1580 if (!clipboardHelper
.Open(GetSafeHwnd()))
1583 HGLOBAL hClipboardData
= GetClipboardData(CF_TEXT
);
1584 if (!hClipboardData
)
1587 char* pStr
= (char*)GlobalLock(hClipboardData
);
1589 GlobalUnlock(hClipboardData
);
1594 if (LookLikeGitHash(str
, pos
))
1598 void CLogDlg::JumpToGitHash(CString
& hash
)
1600 for (int i
= 0; i
< m_LogList
.m_arShownList
.GetCount(); ++i
)
1602 GitRev
* rev
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
1604 if (rev
->m_CommitHash
.ToString().Left(hash
.GetLength()) != hash
)
1607 m_LogList
.SetItemState(m_LogList
.GetSelectionMark(), 0, LVIS_SELECTED
| LVIS_FOCUSED
);
1608 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
1611 int index
= m_LogList
.GetNextSelectedItem(pos
);
1613 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
1615 m_LogList
.EnsureVisible(i
, FALSE
);
1616 m_LogList
.SetSelectionMark(i
);
1617 m_LogList
.SetItemState(i
, LVIS_SELECTED
| LVIS_FOCUSED
, LVIS_SELECTED
| LVIS_FOCUSED
);
1618 // refresh of selection needs to be queued instead of done immediately, to ensure hyperlinks in target selection are created
1619 PostMessage(WM_TGIT_REFRESH_SELECTION
, 0, 0);
1623 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
1626 BOOL
CLogDlg::PreTranslateMessage(MSG
* pMsg
)
1628 // Skip Ctrl-C when copying text out of the log message or search filter
1629 bool bSkipAccelerator
= (pMsg
->message
== WM_KEYDOWN
&& (pMsg
->wParam
== 'C' || pMsg
->wParam
== VK_INSERT
) && (GetFocus() == GetDlgItem(IDC_MSGVIEW
) || GetFocus() == GetDlgItem(IDC_SEARCHEDIT
) || GetFocus() == GetDlgItem(IDC_FILTER
)) && GetKeyState(VK_CONTROL
) & 0x8000);
1630 if (pMsg
->message
== WM_KEYDOWN
&& pMsg
->wParam
=='\r')
1632 if (GetFocus()==GetDlgItem(IDC_LOGLIST
))
1634 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE
))
1636 m_LogList
.DiffSelectedRevWithPrevious();
1640 if (GetFocus() == GetDlgItem(IDC_SEARCHEDIT
))
1642 KillTimer(LOGFILTER_TIMER
);
1643 m_LogList
.Refresh(FALSE
);
1644 FillLogMessageCtrl(false);
1646 if (GetFocus() == GetDlgItem(IDC_FILTER
))
1648 KillTimer(FILEFILTER_TIMER
);
1649 FillLogMessageCtrl();
1653 else if (pMsg
->message
== WM_KEYDOWN
&& ((pMsg
->wParam
== 'V' && GetKeyState(VK_CONTROL
) < 0) || (pMsg
->wParam
== VK_INSERT
&& GetKeyState(VK_SHIFT
) < 0 && GetKeyState(VK_CONTROL
) >= 0)) && GetKeyState(VK_MENU
) >= 0)
1655 if (GetFocus() != GetDlgItem(IDC_SEARCHEDIT
))
1661 else if (pMsg
->message
== WM_XBUTTONUP
)
1663 bool select
= (pMsg
->wParam
& MK_SHIFT
) == 0;
1664 if (HIWORD(pMsg
->wParam
) & XBUTTON1
)
1665 GoBackForward(select
, false);
1666 if (HIWORD(pMsg
->wParam
) & XBUTTON2
)
1667 GoBackForward(select
, true);
1668 if (HIWORD(pMsg
->wParam
) & (XBUTTON1
| XBUTTON2
))
1671 if (m_hAccel
&& !bSkipAccelerator
)
1673 int ret
= TranslateAccelerator(m_hWnd
, m_hAccel
, pMsg
);
1678 return __super::PreTranslateMessage(pMsg
);
1682 BOOL
CLogDlg::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
1684 //if (this->IsThreadRunning())
1685 if(m_LogList
.m_bNoDispUpdates
)
1687 // only show the wait cursor over the list control
1689 ((pWnd
== GetDlgItem(IDC_LOGLIST
))||
1690 (pWnd
== GetDlgItem(IDC_MSGVIEW
))||
1691 (pWnd
== GetDlgItem(IDC_LOGMSG
))))
1693 HCURSOR hCur
= LoadCursor(NULL
, IDC_WAIT
);
1698 if ((pWnd
) && (pWnd
== GetDlgItem(IDC_MSGVIEW
)))
1699 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1701 HCURSOR hCur
= LoadCursor(NULL
, IDC_ARROW
);
1703 return CResizableStandAloneDialog::OnSetCursor(pWnd
, nHitTest
, message
);
1706 void CLogDlg::OnLvnItemchangedLoglist(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1708 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1710 //if (this->IsThreadRunning())
1711 if(m_LogList
.m_bNoDispUpdates
)
1713 if (pNMLV
->iItem
>= 0)
1715 if (!m_LogList
.m_highlight
.IsEmpty())
1717 m_LogList
.m_highlight
.Empty();
1718 m_LogList
.Invalidate();
1720 this->m_LogList
.m_nSearchIndex
= pNMLV
->iItem
;
1721 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(pNMLV
->iItem
));
1722 if (pLogEntry
== nullptr)
1724 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1725 if (pNMLV
->iSubItem
!= 0)
1727 if ((pNMLV
->iItem
== m_LogList
.m_arShownList
.GetCount()))
1729 // remove the selected state
1730 if (pNMLV
->uChanged
& LVIF_STATE
)
1732 m_LogList
.SetItemState(pNMLV
->iItem
, 0, LVIS_SELECTED
);
1733 FillLogMessageCtrl();
1735 UpdateLogInfoLabel();
1739 if (pNMLV
->uChanged
& LVIF_STATE
)
1741 if ((pNMLV
->uNewState
& LVIS_SELECTED
) && !m_bNavigatingWithSelect
)
1743 m_LogList
.m_selectionHistory
.Add(m_LogList
.m_lastSelectedHash
);
1744 m_LogList
.m_lastSelectedHash
= pLogEntry
->m_CommitHash
;
1746 FillLogMessageCtrl();
1752 m_LogList
.m_lastSelectedHash
.Empty();
1753 FillLogMessageCtrl();
1757 UpdateLogInfoLabel();
1760 void CLogDlg::OnLvnItemchangedLogmsg(NMHDR
* /*pNMHDR*/, LRESULT
* /*pResult*/)
1762 UpdateLogInfoLabel();
1765 void CLogDlg::OnEnLinkMsgview(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1767 ENLINK
*pEnLink
= reinterpret_cast<ENLINK
*>(pNMHDR
);
1768 if ((pEnLink
->msg
== WM_LBUTTONUP
) || (pEnLink
->msg
== WM_SETCURSOR
))
1771 GetDlgItemText(IDC_MSGVIEW
, msg
);
1772 msg
.Replace(_T("\r\n"), _T("\n"));
1773 url
= msg
.Mid(pEnLink
->chrg
.cpMin
, pEnLink
->chrg
.cpMax
-pEnLink
->chrg
.cpMin
);
1774 auto findResult
= m_LogList
.m_ProjectProperties
.FindBugIDPositions(msg
);
1775 if (std::find_if(findResult
.begin(), findResult
.end(),
1776 [=] (const CHARRANGE
&cr
) -> bool { return cr
.cpMin
== pEnLink
->chrg
.cpMin
&& cr
.cpMax
== pEnLink
->chrg
.cpMax
; }
1777 ) != findResult
.end())
1779 url
= m_LogList
.m_ProjectProperties
.GetBugIDUrl(url
);
1780 url
= GetAbsoluteUrlFromRelativeUrl(url
);
1782 if (::PathIsURL(url
))
1784 if (pEnLink
->msg
== WM_LBUTTONUP
)
1785 ShellExecute(this->m_hWnd
, _T("open"), url
, NULL
, NULL
, SW_SHOWDEFAULT
);
1788 static RECT prevRect
= { 0 };
1789 CWnd
* pMsgView
= GetDlgItem(IDC_MSGVIEW
);
1794 pMsgView
->SendMessage(EM_POSFROMCHAR
, (WPARAM
)&pt
, pEnLink
->chrg
.cpMin
);
1797 pMsgView
->SendMessage(EM_POSFROMCHAR
, (WPARAM
)&pt
, pEnLink
->chrg
.cpMax
);
1799 rc
.bottom
= pt
.y
+ 12;
1800 if ((prevRect
.left
!= rc
.left
) || (prevRect
.top
!= rc
.top
))
1802 m_tooltips
.DelTool(pMsgView
, 1);
1803 m_tooltips
.AddTool(pMsgView
, url
, &rc
, 1);
1809 else if(pEnLink
->msg
== WM_LBUTTONUP
)
1812 if (LookLikeGitHash(url
, pos
))
1819 void CLogDlg::OnBnClickedStatbutton()
1821 if (this->IsThreadRunning())
1823 if (m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
)
1824 return; // nothing or just the working copy changes are shown, so no statistics.
1825 // the statistics dialog expects the log entries to be sorted by date
1826 SortByColumn(3, false);
1829 m_LogList
.RecalculateShownList(&dlg
.m_ShowList
);
1831 dlg
.m_path
= m_orgPath
;
1833 // restore the previous sorting
1834 SortByColumn(m_nSortColumn
, m_bAscending
);
1835 OnTimer(LOGFILTER_TIMER
);
1838 void CLogDlg::MoveToSameTop(CWnd
*pWndRef
, CWnd
*pWndTarget
)
1840 CRect rcWndPicAuthor
, rcWndMsgView
;
1841 pWndRef
->GetWindowRect(rcWndMsgView
);
1842 ScreenToClient(rcWndMsgView
);
1843 pWndTarget
->GetWindowRect(rcWndPicAuthor
);
1844 ScreenToClient(rcWndPicAuthor
);
1845 int diff
= rcWndMsgView
.top
- rcWndPicAuthor
.top
;
1846 rcWndPicAuthor
.top
+= diff
;
1847 rcWndPicAuthor
.bottom
+= diff
;
1848 pWndTarget
->MoveWindow(rcWndPicAuthor
);
1851 void CLogDlg::DoSizeV1(int delta
)
1853 RemoveMainAnchors();
1855 // first, reduce the middle section to a minimum.
1856 // if that is not sufficient, minimize the lower section
1858 CRect changeListViewRect
;
1859 m_ChangedFileListCtrl
.GetClientRect(changeListViewRect
);
1860 CRect messageViewRect
;
1861 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(messageViewRect
);
1863 int messageViewDelta
= max(-delta
, 20 - messageViewRect
.Height());
1864 int changeFileListDelta
= -delta
- messageViewDelta
;
1866 // set new sizes & positions
1867 CSplitterControl::ChangeHeight(&m_LogList
, delta
, CW_TOPALIGN
);
1868 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), messageViewDelta
, CW_TOPALIGN
);
1869 CSplitterControl::ChangePos(GetDlgItem(IDC_MSGVIEW
), 0, delta
);
1870 MoveToSameTop(GetDlgItem(IDC_MSGVIEW
), GetDlgItem(IDC_PIC_AUTHOR
));
1871 CSplitterControl::ChangePos(GetDlgItem(IDC_SPLITTERBOTTOM
), 0, -changeFileListDelta
);
1872 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl
, changeFileListDelta
, CW_BOTTOMALIGN
);
1878 m_LogList
.Invalidate();
1879 m_ChangedFileListCtrl
.Invalidate();
1880 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1881 m_gravatar
.Invalidate();
1884 void CLogDlg::DoSizeV2(int delta
)
1886 RemoveMainAnchors();
1888 // first, reduce the middle section to a minimum.
1889 // if that is not sufficient, minimize the top section
1892 m_LogList
.GetClientRect(logViewRect
);
1893 CRect messageViewRect
;
1894 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(messageViewRect
);
1896 int messageViewDelta
= max(delta
, 20 - messageViewRect
.Height());
1897 int logListDelta
= delta
- messageViewDelta
;
1899 // set new sizes & positions
1900 CSplitterControl::ChangeHeight(&m_LogList
, logListDelta
, CW_TOPALIGN
);
1901 CSplitterControl::ChangePos(GetDlgItem(IDC_SPLITTERTOP
), 0, logListDelta
);
1903 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW
), messageViewDelta
, CW_TOPALIGN
);
1904 CSplitterControl::ChangePos(GetDlgItem(IDC_MSGVIEW
), 0, logListDelta
);
1905 MoveToSameTop(GetDlgItem(IDC_MSGVIEW
), GetDlgItem(IDC_PIC_AUTHOR
));
1907 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl
, -delta
, CW_BOTTOMALIGN
);
1913 GetDlgItem(IDC_MSGVIEW
)->Invalidate();
1914 m_ChangedFileListCtrl
.Invalidate();
1915 m_gravatar
.Invalidate();
1918 void CLogDlg::AddMainAnchors()
1920 AddAnchor(IDC_STATIC_REF
, TOP_LEFT
);
1921 AddAnchor(IDC_FROMLABEL
, TOP_LEFT
);
1922 AddAnchor(IDC_DATEFROM
, TOP_LEFT
);
1923 AddAnchor(IDC_TOLABEL
, TOP_LEFT
);
1924 AddAnchor(IDC_DATETO
, TOP_LEFT
);
1926 AddAnchor(IDC_SEARCHEDIT
, TOP_LEFT
, TOP_RIGHT
);
1927 AddAnchor(IDC_LOG_JUMPTYPE
, TOP_RIGHT
);
1928 AddAnchor(IDC_LOG_JUMPUP
, TOP_RIGHT
);
1929 AddAnchor(IDC_LOG_JUMPDOWN
, TOP_RIGHT
);
1931 AddAnchor(IDC_LOGLIST
, TOP_LEFT
, MIDDLE_RIGHT
);
1932 AddAnchor(IDC_SPLITTERTOP
, MIDDLE_LEFT
, MIDDLE_RIGHT
);
1933 AddAnchor(IDC_MSGVIEW
, MIDDLE_LEFT
, MIDDLE_RIGHT
); // keep in sync with ShowGravatar()
1934 AddAnchor(IDC_PIC_AUTHOR
, MIDDLE_RIGHT
);
1935 AddAnchor(IDC_SPLITTERBOTTOM
, MIDDLE_LEFT
, MIDDLE_RIGHT
);
1936 AddAnchor(IDC_LOGMSG
, MIDDLE_LEFT
, BOTTOM_RIGHT
);
1938 AddAnchor(IDC_LOGINFO
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1939 AddAnchor(IDC_WALKBEHAVIOUR
, BOTTOM_LEFT
);
1940 AddAnchor(IDC_VIEW
, BOTTOM_LEFT
);
1941 AddAnchor(IDC_LOG_ALLBRANCH
, BOTTOM_LEFT
);
1942 AddAnchor(IDC_FILTER
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1943 AddAnchor(IDC_WHOLE_PROJECT
, BOTTOM_LEFT
);
1944 AddAnchor(IDC_REFRESH
, BOTTOM_LEFT
);
1945 AddAnchor(IDC_STATBUTTON
, BOTTOM_LEFT
);
1946 AddAnchor(IDC_PROGRESS
, BOTTOM_LEFT
, BOTTOM_RIGHT
);
1947 AddAnchor(IDOK
, BOTTOM_RIGHT
);
1948 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
1949 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
1952 void CLogDlg::RemoveMainAnchors()
1954 RemoveAnchor(IDC_STATIC_REF
);
1955 RemoveAnchor(IDC_FROMLABEL
);
1956 RemoveAnchor(IDC_DATEFROM
);
1957 RemoveAnchor(IDC_TOLABEL
);
1958 RemoveAnchor(IDC_DATETO
);
1960 RemoveAnchor(IDC_SEARCHEDIT
);
1961 RemoveAnchor(IDC_LOG_JUMPTYPE
);
1962 RemoveAnchor(IDC_LOG_JUMPUP
);
1963 RemoveAnchor(IDC_LOG_JUMPDOWN
);
1965 RemoveAnchor(IDC_LOGLIST
);
1966 RemoveAnchor(IDC_SPLITTERTOP
);
1967 RemoveAnchor(IDC_MSGVIEW
);
1968 RemoveAnchor(IDC_PIC_AUTHOR
);
1969 RemoveAnchor(IDC_SPLITTERBOTTOM
);
1970 RemoveAnchor(IDC_LOGMSG
);
1972 RemoveAnchor(IDC_LOGINFO
);
1973 RemoveAnchor(IDC_WALKBEHAVIOUR
);
1974 RemoveAnchor(IDC_VIEW
);
1975 RemoveAnchor(IDC_LOG_ALLBRANCH
);
1976 RemoveAnchor(IDC_FILTER
);
1977 RemoveAnchor(IDC_WHOLE_PROJECT
);
1978 RemoveAnchor(IDC_REFRESH
);
1979 RemoveAnchor(IDC_STATBUTTON
);
1980 RemoveAnchor(IDC_PROGRESS
);
1982 RemoveAnchor(IDCANCEL
);
1983 RemoveAnchor(IDHELP
);
1986 void CLogDlg::AdjustMinSize()
1988 // adjust the minimum size of the dialog to prevent the resizing from
1989 // moving the list control too far down.
1990 CRect rcChgListView
;
1991 m_ChangedFileListCtrl
.GetClientRect(rcChgListView
);
1993 m_LogList
.GetClientRect(rcLogList
);
1995 GetDlgItem(IDC_MSGVIEW
)->GetClientRect(rcLogMsg
);
1997 SetMinTrackSize(CSize(m_DlgOrigRect
.Width(),
1998 m_DlgOrigRect
.Height()-m_ChgOrigRect
.Height()-m_LogListOrigRect
.Height()-m_MsgViewOrigRect
.Height()
1999 + rcLogMsg
.Height() + abs(rcChgListView
.Height() - rcLogList
.Height()) + 60));
2002 LRESULT
CLogDlg::DefWindowProc(UINT message
, WPARAM wParam
, LPARAM lParam
)
2006 if (wParam
== IDC_SPLITTERTOP
)
2008 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
2009 DoSizeV1(pHdr
->delta
);
2011 else if (wParam
== IDC_SPLITTERBOTTOM
)
2013 SPC_NMHDR
* pHdr
= (SPC_NMHDR
*) lParam
;
2014 DoSizeV2(pHdr
->delta
);
2019 return CResizableDialog::DefWindowProc(message
, wParam
, lParam
);
2022 void CLogDlg::SetSplitterRange()
2024 if ((m_LogList
)&&(m_ChangedFileListCtrl
))
2027 m_LogList
.GetWindowRect(rcTop
);
2028 ScreenToClient(rcTop
);
2030 m_ChangedFileListCtrl
.GetWindowRect(rcBottom
);
2031 ScreenToClient(rcBottom
);
2032 m_wndSplitter1
.SetRange(rcTop
.top
+ 20, rcBottom
.bottom
- 50);
2033 m_wndSplitter2
.SetRange(rcTop
.top
+ 50, rcBottom
.bottom
- 20);
2037 void CLogDlg::OnEnscrollMsgview()
2039 m_tooltips
.DelTool(GetDlgItem(IDC_MSGVIEW
), 1);
2042 LRESULT
CLogDlg::OnClickedInfoIcon(WPARAM wParam
, LPARAM lParam
)
2044 if ((HWND
)wParam
== m_cFileFilter
.GetSafeHwnd())
2047 // FIXME: x64 version would get this function called with unexpected parameters.
2051 RECT
* rect
= (LPRECT
)lParam
;
2054 point
= CPoint(rect
->left
, rect
->bottom
);
2055 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | ((m_LogList.m_SelectedFilters & x) ? MF_CHECKED : MF_UNCHECKED))
2057 if (popup
.CreatePopupMenu())
2059 temp
.LoadString(IDS_LOG_FILTER_SUBJECT
);
2060 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT
), LOGFILTER_SUBJECT
, temp
);
2062 temp
.LoadString(IDS_LOG_FILTER_MESSAGES
);
2063 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES
), LOGFILTER_MESSAGES
, temp
);
2065 temp
.LoadString(IDS_LOG_FILTER_PATHS
);
2066 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS
), LOGFILTER_PATHS
, temp
);
2068 temp
.LoadString(IDS_LOG_FILTER_AUTHORS
);
2069 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS
), LOGFILTER_AUTHORS
, temp
);
2071 temp
.LoadString(IDS_LOG_FILTER_EMAILS
);
2072 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_EMAILS
), LOGFILTER_EMAILS
, temp
);
2074 temp
.LoadString(IDS_LOG_FILTER_REVS
);
2075 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS
), LOGFILTER_REVS
, temp
);
2077 temp
.LoadString(IDS_LOG_FILTER_REFNAME
);
2078 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME
), LOGFILTER_REFNAME
, temp
);
2080 if (m_LogList
.m_bShowBugtraqColumn
== TRUE
) {
2081 temp
.LoadString(IDS_LOG_FILTER_BUGIDS
);
2082 popup
.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID
), LOGFILTER_BUGID
, temp
);
2085 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2087 temp
.LoadString(IDS_LOG_FILTER_TOGGLE
);
2088 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, LOGFILTER_TOGGLE
, temp
);
2090 temp
.LoadString(IDS_ALL
);
2091 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, LOGFILTER_ALL
, temp
);
2093 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
2095 temp
.LoadString(IDS_LOG_FILTER_REGEX
);
2096 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterWithRegex
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_REGEX
, temp
);
2098 temp
.LoadString(IDS_LOG_FILTER_CASESENSITIVE
);
2099 popup
.AppendMenu(MF_STRING
| MF_ENABLED
| (m_bFilterCaseSensitively
? MF_CHECKED
: MF_UNCHECKED
), LOGFILTER_CASE
, temp
);
2102 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
2106 if (selection
== LOGFILTER_REGEX
)
2108 m_bFilterWithRegex
= !m_bFilterWithRegex
;
2109 CRegDWORD
b(_T("Software\\TortoiseGit\\UseRegexFilter"), FALSE
);
2110 b
= m_bFilterWithRegex
;
2111 m_LogList
.m_bFilterWithRegex
= m_bFilterWithRegex
;
2113 CheckRegexpTooltip();
2115 else if (selection
== LOGFILTER_CASE
)
2117 m_bFilterCaseSensitively
= !m_bFilterCaseSensitively
;
2118 CRegDWORD
b(_T("Software\\TortoiseGit\\FilterCaseSensitively"), FALSE
);
2119 b
= m_bFilterCaseSensitively
;
2120 m_LogList
.m_bFilterCaseSensitively
= m_bFilterCaseSensitively
;
2122 else if (selection
== LOGFILTER_TOGGLE
)
2124 m_LogList
.m_SelectedFilters
= (~m_LogList
.m_SelectedFilters
) & LOGFILTER_ALL
;
2127 else if (selection
== LOGFILTER_ALL
)
2129 m_LogList
.m_SelectedFilters
= selection
;
2134 m_LogList
.m_SelectedFilters
^= selection
;
2137 CRegDWORD(_T("Software\\TortoiseGit\\SelectedLogFilters")) = m_LogList
.m_SelectedFilters
;
2138 // Reload only if a search text is entered
2139 if (m_LogList
.HasFilterText())
2140 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
2146 LRESULT
CLogDlg::OnClickedCancelFilter(WPARAM wParam
, LPARAM
/*lParam*/)
2148 if ((HWND
)wParam
== m_cFileFilter
.GetSafeHwnd())
2150 KillTimer(FILEFILTER_TIMER
);
2152 FillLogMessageCtrl();
2156 KillTimer(LOGFILTER_TIMER
);
2158 m_LogList
.m_sFilterText
.Empty();
2160 theApp
.DoWaitCursor(1);
2161 FillLogMessageCtrl(false);
2163 m_LogList
.RemoveFilter();
2167 theApp
.DoWaitCursor(-1);
2168 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2169 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2170 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2171 UpdateLogInfoLabel();
2177 void CLogDlg::SetFilterCueText()
2179 CString
temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY
));
2182 if (m_LogList
.m_SelectedFilters
& LOGFILTER_SUBJECT
)
2184 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT
));
2187 if (m_LogList
.m_SelectedFilters
& LOGFILTER_MESSAGES
)
2189 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
2191 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES
));
2194 if (m_LogList
.m_SelectedFilters
& LOGFILTER_PATHS
)
2196 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
2198 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS
));
2201 if (m_LogList
.m_SelectedFilters
& LOGFILTER_AUTHORS
)
2203 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
2205 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS
));
2208 if (m_LogList
.m_SelectedFilters
& LOGFILTER_EMAILS
)
2210 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
2212 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_EMAILS
));
2215 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REVS
)
2217 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
2219 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS
));
2222 if (m_LogList
.m_SelectedFilters
& LOGFILTER_REFNAME
)
2224 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
2226 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REFNAME
));
2229 if (m_LogList
.m_bShowBugtraqColumn
&& m_LogList
.m_SelectedFilters
& LOGFILTER_BUGID
)
2231 if (temp
.ReverseFind(_T(' ')) != temp
.GetLength() - 1)
2233 temp
+= CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS
));
2236 // to make the cue banner text appear more to the right of the edit control
2237 temp
= _T(" ")+temp
;
2238 m_cFilter
.SetCueBanner(temp
.TrimRight());
2241 bool CLogDlg::Validate(LPCTSTR string
)
2243 if (!m_bFilterWithRegex
)
2245 std::tr1::wregex pat
;
2246 return m_LogList
.ValidateRegexp(string
, pat
, false);
2249 void CLogDlg::OnEnChangeFileFilter()
2251 SetTimer(FILEFILTER_TIMER
, 1000, NULL
);
2254 void CLogDlg::OnTimer(UINT_PTR nIDEvent
)
2256 if (nIDEvent
== LOGFTIME_TIMER
)
2258 KillTimer(LOGFTIME_TIMER
);
2259 m_LogList
.Refresh(FALSE
);
2260 FillLogMessageCtrl(false);
2262 else if (nIDEvent
== LOG_FILLPATCHVTIMER
)
2266 else if (nIDEvent
== LOGFILTER_TIMER
)
2268 KillTimer(LOGFILTER_TIMER
);
2269 m_LogList
.Refresh(FALSE
);
2270 FillLogMessageCtrl(false);
2273 /* we will use git built-in grep to filter log */
2274 if (this->IsThreadRunning())
2276 // thread still running! So just restart the timer.
2277 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
2280 CWnd
* focusWnd
= GetFocus();
2281 bool bSetFocusToFilterControl
= ((focusWnd
!= GetDlgItem(IDC_DATEFROM
))&&(focusWnd
!= GetDlgItem(IDC_DATETO
))
2282 && (focusWnd
!= GetDlgItem(IDC_LOGLIST
)));
2283 if (m_LogList
.m_sFilterText
.IsEmpty())
2285 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
2286 // do not return here!
2287 // we also need to run the filter if the filter text is empty:
2288 // 1. to clear an existing filter
2289 // 2. to rebuild the m_arShownList after sorting
2291 theApp
.DoWaitCursor(1);
2292 CStoreSelection
storeselection(this);
2293 KillTimer(LOGFILTER_TIMER
);
2294 FillLogMessageCtrl(false);
2296 // now start filter the log list
2297 m_LogList
.StartFilter();
2299 if ( m_LogList
.GetItemCount()==1 )
2301 m_LogList
.SetSelectionMark(0);
2302 m_LogList
.SetItemState(0, LVIS_SELECTED
, LVIS_SELECTED
);
2304 theApp
.DoWaitCursor(-1);
2305 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2306 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2307 if (bSetFocusToFilterControl
)
2308 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2309 UpdateLogInfoLabel();
2311 } // if (nIDEvent == LOGFILTER_TIMER)
2312 else if (nIDEvent
== LOG_HEADER_ORDER_TIMER
)
2314 KillTimer(LOG_HEADER_ORDER_TIMER
);
2315 CLogOrdering orderDlg
;
2316 if (orderDlg
.DoModal() == IDOK
)
2319 else if (nIDEvent
== FILEFILTER_TIMER
)
2321 KillTimer(FILEFILTER_TIMER
);
2322 FillLogMessageCtrl();
2324 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty() || m_LogList
.m_arShownList
.GetCount() == 1 && m_LogList
.m_bShowWC
))));
2325 __super::OnTimer(nIDEvent
);
2328 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2333 m_DateTo
.GetTime(_time
);
2336 m_DateFrom
.GetTime(fromTime
);
2337 if (_time
< fromTime
)
2340 m_DateTo
.SetTime(&_time
);
2343 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 23, 59, 59);
2344 if (time
.GetTime() != m_LogList
.m_Filter
.m_To
)
2346 m_LogList
.m_Filter
.m_To
= (DWORD
)time
.GetTime();
2347 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
2352 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2358 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2364 m_DateFrom
.GetTime(_time
);
2367 m_DateTo
.GetTime(toTime
);
2371 m_DateFrom
.SetTime(&_time
);
2374 CTime
time(_time
.GetYear(), _time
.GetMonth(), _time
.GetDay(), 0, 0, 0);
2375 if (time
.GetTime() != m_LogList
.m_Filter
.m_From
)
2377 m_LogList
.m_Filter
.m_From
= (DWORD
)time
.GetTime();
2378 m_LogList
.m_Filter
.m_NumberOfLogsScale
= CFilterData::SHOW_LAST_SEL_DATE
;
2380 if (CFilterData::SHOW_LAST_SEL_DATE
== (DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\NumberOfLogsScale"), CFilterData::SHOW_NO_LIMIT
))
2381 m_regLastSelectedFromDate
= time
.Format(L
"%Y-%m-%d");
2383 SetTimer(LOGFTIME_TIMER
, 10, NULL
);
2388 CMessageBox::Show(NULL
,_T("Invalidate Parameter"),_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
2394 void CLogDlg::OnCbnSelchangeJumpType()
2396 // reserved for future use
2399 void CLogDlg::OnBnClickedJumpUp()
2401 int sel
= m_JumpType
.GetCurSel();
2402 if (sel
< 0) return;
2403 JumpType jumpType
= (JumpType
)sel
;
2405 if (jumpType
== JumpType_History
)
2414 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2417 index
= m_LogList
.GetNextSelectedItem(pos
);
2418 if (index
== 0) return;
2420 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
2421 if (jumpType
== JumpType_AuthorEmail
)
2422 strValue
= data
->GetAuthorEmail();
2423 else if (jumpType
== JumpType_CommitterEmail
)
2424 strValue
= data
->GetCommitterEmail();
2425 else if (jumpType
== JumpType_Parent1
)
2426 hashValue
= data
->m_CommitHash
;
2427 else if (jumpType
== JumpType_Parent2
)
2428 hashValue
= data
->m_CommitHash
;
2429 else if (jumpType
== JumpType_TagFF
)
2430 hashValue
= data
->m_CommitHash
;
2431 else if (jumpType
== JumpType_BranchFF
)
2432 hashValue
= data
->m_CommitHash
;
2434 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2441 index
= m_LogList
.GetNextSelectedItem(pos
);
2442 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2444 m_LogList
.SetSelectionMark(-1);
2446 for (int i
= index
- 1; i
>= 0; i
--)
2449 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
2450 if (jumpType
== JumpType_AuthorEmail
)
2451 found
= strValue
== data
->GetAuthorEmail();
2452 else if (jumpType
== JumpType_CommitterEmail
)
2453 found
= strValue
== data
->GetCommitterEmail();
2454 else if (jumpType
== JumpType_MergePoint
)
2455 found
= data
->ParentsCount() > 1;
2456 else if (jumpType
== JumpType_Parent1
)
2458 if (!data
->m_ParentHash
.empty())
2459 found
= data
->m_ParentHash
[0] == hashValue
;
2461 else if (jumpType
== JumpType_Parent2
)
2463 if (data
->m_ParentHash
.size() > 1)
2464 found
= data
->m_ParentHash
[1] == hashValue
;
2466 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
2468 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2469 for (size_t j
= 0; j
< refList
.size(); ++j
)
2471 if (refList
[j
].Left(10) == _T("refs/tags/"))
2478 if (found
&& jumpType
== JumpType_TagFF
)
2479 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
2481 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2483 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2484 for (size_t j
= 0; j
< refList
.size(); ++j
)
2486 if (refList
[j
].Left(11) == _T("refs/heads/") || refList
[j
].Left(13) == _T("refs/remotes/"))
2493 if (found
&& jumpType
== JumpType_BranchFF
)
2494 found
= g_Git
.IsFastForward(hashValue
, data
->m_CommitHash
);
2499 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2500 m_LogList
.EnsureVisible(i
, FALSE
);
2501 m_LogList
.SetSelectionMark(i
);
2506 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
2509 void CLogDlg::OnBnClickedJumpDown()
2511 int jumpType
= m_JumpType
.GetCurSel();
2512 if (jumpType
< 0) return;
2514 if (jumpType
== JumpType_History
)
2523 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2526 index
= m_LogList
.GetNextSelectedItem(pos
);
2527 if (index
== 0) return;
2529 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(index
);
2530 if (jumpType
== JumpType_AuthorEmail
)
2531 strValue
= data
->GetAuthorEmail();
2532 else if (jumpType
== JumpType_CommitterEmail
)
2533 strValue
= data
->GetCommitterEmail();
2534 else if (jumpType
== JumpType_Parent1
)
2536 if (!data
->m_ParentHash
.empty())
2537 hashValue
= data
->m_ParentHash
.at(0);
2541 else if (jumpType
== JumpType_Parent2
)
2543 if (data
->m_ParentHash
.size() > 1)
2544 hashValue
= data
->m_ParentHash
.at(1);
2548 else if (jumpType
== JumpType_TagFF
)
2549 hashValue
= data
->m_CommitHash
;
2550 else if (jumpType
== JumpType_BranchFF
)
2551 hashValue
= data
->m_CommitHash
;
2553 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2560 index
= m_LogList
.GetNextSelectedItem(pos
);
2561 m_LogList
.SetItemState(index
, 0, LVIS_SELECTED
);
2563 m_LogList
.SetSelectionMark(-1);
2565 for (int i
= index
+ 1; i
< m_LogList
.GetItemCount(); ++i
)
2568 GitRev
* data
= (GitRev
*)m_LogList
.m_arShownList
.SafeGetAt(i
);
2569 if (jumpType
== JumpType_AuthorEmail
)
2570 found
= strValue
== data
->GetAuthorEmail();
2571 else if (jumpType
== JumpType_CommitterEmail
)
2572 found
= strValue
== data
->GetCommitterEmail();
2573 else if (jumpType
== JumpType_MergePoint
)
2574 found
= data
->ParentsCount() > 1;
2575 else if (jumpType
== JumpType_Parent1
)
2576 found
= data
->m_CommitHash
== hashValue
;
2577 else if (jumpType
== JumpType_Parent2
)
2578 found
= data
->m_CommitHash
== hashValue
;
2579 else if (jumpType
== JumpType_Tag
|| jumpType
== JumpType_TagFF
)
2581 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2582 for (size_t j
= 0; j
< refList
.size(); ++j
)
2584 if (refList
[j
].Left(10) == _T("refs/tags/"))
2591 if (found
&& jumpType
== JumpType_TagFF
)
2592 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
2594 else if (jumpType
== JumpType_Branch
|| jumpType
== JumpType_BranchFF
)
2596 STRING_VECTOR refList
= m_LogList
.m_HashMap
[data
->m_CommitHash
];
2597 for (size_t j
= 0; j
< refList
.size(); ++j
)
2599 if (refList
[j
].Left(11) == _T("refs/heads/") || refList
[j
].Left(13) == _T("refs/remotes/"))
2606 if (found
&& jumpType
== JumpType_BranchFF
)
2607 found
= g_Git
.IsFastForward(data
->m_CommitHash
, hashValue
);
2612 m_LogList
.SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
2613 m_LogList
.EnsureVisible(i
, FALSE
);
2614 m_LogList
.SetSelectionMark(i
);
2619 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND
, IDS_APPNAME
, 1, IDI_INFORMATION
, IDS_OKBUTTON
, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN
);
2622 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
2630 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscRevSort());
2632 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescRevSort());
2638 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscActionSort());
2640 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescActionSort());
2646 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscAuthorSort());
2648 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescAuthorSort());
2654 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscDateSort());
2656 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescDateSort());
2659 case 4: // Message or bug id
2660 if (m_bShowBugtraqColumn
)
2663 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscBugIDSort());
2665 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescBugIDSort());
2668 // fall through here
2672 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::AscMessageSort());
2674 std::sort(m_logEntries
.begin(), m_logEntries
.end(), CLogDataVector::DescMessageSort());
2684 void CLogDlg::OnLvnColumnclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2686 if (this->IsThreadRunning())
2687 return; //no sorting while the arrays are filled
2689 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
2690 const int nColumn
= pNMLV
->iSubItem
;
2691 m_bAscending
= nColumn
== m_nSortColumn
? !m_bAscending
: TRUE
;
2692 m_nSortColumn
= nColumn
;
2693 SortByColumn(m_nSortColumn
, m_bAscending
);
2694 SetSortArrow(&m_LogList
, m_nSortColumn
, !!m_bAscending
);
2695 SortShownListArray();
2696 m_LogList
.Invalidate();
2697 UpdateLogInfoLabel();
2699 UNREFERENCED_PARAMETER(pNMHDR
);
2703 SetTimer(LOG_HEADER_ORDER_TIMER
, 10, nullptr);
2706 void CLogDlg::SortShownListArray()
2708 // make sure the shown list still matches the filter after sorting.
2709 OnTimer(LOGFILTER_TIMER
);
2710 // clear the selection states
2711 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
2714 m_LogList
.SetItemState(m_LogList
.GetNextSelectedItem(pos
), 0, LVIS_SELECTED
);
2716 m_LogList
.SetSelectionMark(-1);
2719 void CLogDlg::SetSortArrow(CListCtrl
* control
, int nColumn
, bool bAscending
)
2721 if (control
== NULL
)
2723 // set the sort arrow
2724 CHeaderCtrl
* pHeader
= control
->GetHeaderCtrl();
2725 HDITEM HeaderItem
= {0};
2726 HeaderItem
.mask
= HDI_FORMAT
;
2727 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
2729 pHeader
->GetItem(i
, &HeaderItem
);
2730 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
2731 pHeader
->SetItem(i
, &HeaderItem
);
2735 pHeader
->GetItem(nColumn
, &HeaderItem
);
2736 HeaderItem
.fmt
|= (bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
2737 pHeader
->SetItem(nColumn
, &HeaderItem
);
2741 int CLogDlg::m_nSortColumnPathList
= 0;
2742 bool CLogDlg::m_bAscendingPathList
= false;
2744 void CLogDlg::OnBnClickedHidepaths()
2746 FillLogMessageCtrl();
2747 m_ChangedFileListCtrl
.Invalidate();
2750 void CLogDlg::UpdateLogInfoLabel()
2755 long selectedrevs
= 0;
2756 long selectedfiles
= 0;
2757 int count
= (int)m_LogList
.m_arShownList
.GetCount();
2761 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(0)))->m_CommitHash
;
2762 if(this->m_LogList
.m_bShowWC
&& rev1
.IsEmpty()&&(count
>1))
2764 rev1
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(start
)))->m_CommitHash
;
2765 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_arShownList.GetCount()-1));
2766 rev2
= (reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(count
-1)))->m_CommitHash
;
2767 selectedrevs
= m_LogList
.GetSelectedCount();
2769 selectedfiles
= m_ChangedFileListCtrl
.GetSelectedCount();
2772 sTemp
.Format(IDS_PROC_LOG_STATS
,
2774 (LPCTSTR
)rev2
.ToString().Left(g_Git
.GetShortHASHLength()), (LPCTSTR
)rev1
.ToString().Left(g_Git
.GetShortHASHLength()), selectedrevs
, selectedfiles
);
2776 if(selectedrevs
== 1)
2778 CString str
=m_ChangedFileListCtrl
.GetStatisticsString(true);
2779 str
.Replace(_T('\n'), _T(' '));
2780 sTemp
+= _T("\r\n") + str
;
2787 void CLogDlg::OnDtnDropdownDatefrom(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
2789 // the date control should not show the "today" button
2790 CMonthCalCtrl
* pCtrl
= m_DateFrom
.GetMonthCalCtrl();
2792 SetWindowLongPtr(pCtrl
->GetSafeHwnd(), GWL_STYLE
, LONG_PTR(pCtrl
->GetStyle() | MCS_NOTODAY
));
2796 void CLogDlg::OnSize(UINT nType
, int cx
, int cy
)
2798 __super::OnSize(nType
, cx
, cy
);
2803 void CLogDlg::OnRefresh()
2806 this->m_LogProgress
.SetPos(0);
2812 void CLogDlg::OnFocusFilter()
2814 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2817 void CLogDlg::OnEditCopy()
2819 if (GetFocus() == &m_ChangedFileListCtrl
)
2820 CopyChangedSelectionToClipBoard();
2822 m_LogList
.CopySelectionToClipBoard();
2825 CString
CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString
& url
)
2827 // is the URL a relative one?
2828 if (url
.Left(2).Compare(_T("^/")) == 0)
2830 // URL is relative to the repository root
2831 CString url1
= m_sRepositoryRoot
+ url
.Mid(1);
2832 TCHAR buf
[INTERNET_MAX_URL_LENGTH
] = { 0 };
2833 DWORD len
= url
.GetLength();
2834 if (UrlCanonicalize((LPCTSTR
)url1
, buf
, &len
, 0) == S_OK
)
2835 return CString(buf
, len
);
2838 else if (url
[0] == '/')
2840 // URL is relative to the server's hostname
2842 // find the server's hostname
2843 int schemepos
= m_sRepositoryRoot
.Find(_T("//"));
2846 sHost
= m_sRepositoryRoot
.Left(m_sRepositoryRoot
.Find('/', schemepos
+3));
2847 CString url1
= sHost
+ url
;
2848 TCHAR buf
[INTERNET_MAX_URL_LENGTH
] = { 0 };
2849 DWORD len
= url
.GetLength();
2850 if (UrlCanonicalize((LPCTSTR
)url
, buf
, &len
, 0) == S_OK
)
2851 return CString(buf
, len
);
2858 void CLogDlg::ShowGravatar()
2860 m_gravatar
.EnableGravatar(m_bShowGravatar
);
2861 RemoveAnchor(IDC_MSGVIEW
);
2862 if (m_gravatar
.IsGravatarEnabled())
2865 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
2866 ScreenToClient(&rect
);
2867 m_gravatar
.GetWindowRect(&rect2
);
2868 ScreenToClient(&rect2
);
2869 rect
.right
= rect2
.left
;
2870 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
2871 m_gravatar
.ShowWindow(SW_SHOW
);
2876 GetDlgItem(IDC_MSGVIEW
)->GetWindowRect(&rect
);
2877 ScreenToClient(&rect
);
2878 m_gravatar
.GetWindowRect(&rect2
);
2879 ScreenToClient(&rect2
);
2880 rect
.right
= rect2
.right
;
2881 GetDlgItem(IDC_MSGVIEW
)->MoveWindow(&rect
);
2882 m_gravatar
.ShowWindow(SW_HIDE
);
2884 AddAnchor(IDC_MSGVIEW
, MIDDLE_LEFT
, MIDDLE_RIGHT
); // keep in sync with AddMainAnchors
2888 void CLogDlg::OnEnChangeSearchedit()
2891 if (!m_LogList
.HasFilterText())
2893 // clear the filter, i.e. make all entries appear
2894 theApp
.DoWaitCursor(1);
2895 KillTimer(LOGFILTER_TIMER
);
2896 FillLogMessageCtrl(false);
2899 //m_LogList.StartFilter();
2901 InterlockedExchange(&m_bNoDispUpdates
, TRUE
);
2902 m_arShownList
.RemoveAll();
2903 for (DWORD i
=0; i
<m_logEntries
.size(); ++i
)
2905 if (IsEntryInDateRange(i
))
2906 m_arShownList
.Add(m_logEntries
[i
]);
2908 InterlockedExchange(&m_bNoDispUpdates
, FALSE
);
2909 m_LogList
.DeleteAllItems();
2910 m_LogList
.SetItemCountEx(ShownCountWithStopped());
2911 m_LogList
.RedrawItems(0, ShownCountWithStopped());
2912 m_LogList
.SetRedraw(false);
2913 ResizeAllListCtrlCols();
2914 m_LogList
.SetRedraw(true);
2916 theApp
.DoWaitCursor(-1);
2917 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_HIDE
);
2918 GetDlgItem(IDC_SEARCHEDIT
)->ShowWindow(SW_SHOW
);
2919 GetDlgItem(IDC_SEARCHEDIT
)->SetFocus();
2920 DialogEnableWindow(IDC_STATBUTTON
, !(((this->IsThreadRunning())||(m_LogList
.m_arShownList
.IsEmpty()))));
2923 if (Validate(m_LogList
.m_sFilterText
))
2924 SetTimer(LOGFILTER_TIMER
, 1000, NULL
);
2926 KillTimer(LOGFILTER_TIMER
);
2930 void CLogDlg::OnBnClickedAllBranch()
2932 // m_bAllBranch is not auto-toggled by MFC, we have to handle it manually (in order to prevent the indeterminate state)
2934 m_LogList
.m_ShowMask
&=~ (CGit::LOG_INFO_LOCAL_BRANCHES
| CGit::LOG_INFO_ALL_BRANCH
);
2938 m_bAllBranch
= BST_UNCHECKED
;
2939 m_ChangedFileListCtrl
.m_sDisplayedBranch
= m_LogList
.GetRange();
2943 m_bAllBranch
= BST_CHECKED
;
2944 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_ALL_BRANCH
;
2945 m_ChangedFileListCtrl
.m_sDisplayedBranch
.Empty();
2948 // need to save value here, so that log dialogs started from now on also have AllBranch activated
2949 m_regbAllBranch
= m_bAllBranch
;
2955 FillLogMessageCtrl(false);
2958 void CLogDlg::OnBnClickedFollowRenames()
2960 if(m_bFollowRenames
)
2962 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_FOLLOW
;
2963 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_LOCAL_BRANCHES
;
2967 m_bAllBranch
= FALSE
;
2968 m_LogList
.m_ShowMask
&=~ CGit::LOG_INFO_ALL_BRANCH
;
2973 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_FOLLOW
;
2975 DialogEnableWindow(IDC_LOG_ALLBRANCH
, !m_bFollowRenames
);
2976 DialogEnableWindow(IDC_WHOLE_PROJECT
, !m_bFollowRenames
&& !m_path
.IsEmpty());
2980 FillLogMessageCtrl(false);
2983 void CLogDlg::HandleShowLabels(bool var
, int flag
)
2986 m_LogList
.m_ShowRefMask
|= flag
;
2988 m_LogList
.m_ShowRefMask
&= ~flag
;
2990 if ((m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_REFS
) && !(m_LogList
.m_ShowFilter
& CGitLogListBase::FILTERSHOW_ANYCOMMIT
))
2992 // Remove commits where labels are not shown.
2994 FillLogMessageCtrl(false);
2999 m_LogList
.Invalidate();
3003 void CLogDlg::OnBnClickedCompressedGraph()
3007 if (m_iCompressedGraph
== 2)
3008 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_REFS
;
3009 else if (m_iCompressedGraph
== 1)
3010 m_LogList
.m_ShowFilter
= static_cast<CGitLogListBase::FilterShow
>(CGitLogListBase::FILTERSHOW_REFS
| CGitLogListBase::FILTERSHOW_MERGEPOINTS
);
3012 m_LogList
.m_ShowFilter
= CGitLogListBase::FILTERSHOW_ALL
;
3015 FillLogMessageCtrl(false);
3018 void CLogDlg::OnBnClickedBrowseRef()
3020 CString newRef
= CBrowseRefsDlg::PickRef(false, m_LogList
.GetRange(), gPickRef_All
, true);
3021 if(newRef
.IsEmpty())
3024 m_History
.AddEntry(newRef
);
3029 m_LogList
.m_ShowMask
&= ~(CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
);
3030 m_bAllBranch
= BST_UNCHECKED
;
3034 FillLogMessageCtrl(false);
3037 void CLogDlg::ShowStartRef()
3039 //Show ref name on top
3040 if(!::IsWindow(m_hWnd
))
3042 if (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
))
3044 switch (m_LogList
.m_ShowMask
& (CGit::LOG_INFO_ALL_BRANCH
| CGit::LOG_INFO_LOCAL_BRANCHES
))
3046 case CGit::LOG_INFO_ALL_BRANCH
:
3047 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES
)));
3050 case CGit::LOG_INFO_LOCAL_BRANCHES
:
3051 m_staticRef
.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_LOCAL_BRANCHES
)));
3055 m_staticRef
.Invalidate(TRUE
);
3056 m_tooltips
.DelTool(GetDlgItem(IDC_STATIC_REF
));
3060 CString showStartRef
= m_LogList
.GetRange();
3061 if (showStartRef
.IsEmpty() || showStartRef
== _T("HEAD"))
3063 showStartRef
.Empty();
3065 if (g_Git
.Run(L
"git.exe symbolic-ref HEAD", &showStartRef
, NULL
, CP_UTF8
))
3066 showStartRef
.LoadString(IDS_PROC_LOG_NOBRANCH
);
3067 showStartRef
.Trim(L
"\r\n\t ");
3071 showStartRef
= g_Git
.StripRefName(showStartRef
);
3073 m_staticRef
.SetWindowText(showStartRef
);
3074 CWnd
*pWnd
= GetDlgItem(IDC_STATIC_REF
);
3075 m_tooltips
.AddTool(pWnd
, showStartRef
);
3076 m_staticRef
.Invalidate(TRUE
);
3079 void CLogDlg::SetRange(const CString
& range
)
3081 m_LogList
.SetRange(range
);
3082 m_ChangedFileListCtrl
.m_sDisplayedBranch
= range
;
3087 static void AppendMenuChecked(CMenu
&menu
, UINT nTextID
, UINT_PTR nItemID
, BOOL checked
= FALSE
, BOOL enabled
= TRUE
)
3090 text
.LoadString(nTextID
);
3091 menu
.AppendMenu(MF_STRING
| (enabled
? MF_ENABLED
: MF_DISABLED
) | (checked
? MF_CHECKED
: MF_UNCHECKED
), nItemID
, text
);
3094 #define WALKBEHAVIOUR_FIRSTPARENT 1
3095 #define WALKBEHAVIOUR_FOLLOWRENAMES 2
3096 #define WALKBEHAVIOUR_COMPRESSEDGRAPH 3
3097 #define WALKBEHAVIOUR_LABELEDCOMMITS 4
3098 #define WALKBEHAVIOUR_NOMERGES 5
3100 void CLogDlg::OnBnClickedWalkBehaviour()
3103 if (popup
.CreatePopupMenu())
3105 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FIRSTPARENT
, WALKBEHAVIOUR_FIRSTPARENT
, m_bFirstParent
);
3106 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_NOMERGES
, WALKBEHAVIOUR_NOMERGES
, m_bNoMerges
);
3107 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_FOLLOWRENAMES
, WALKBEHAVIOUR_FOLLOWRENAMES
, m_bFollowRenames
, !(m_path
.IsEmpty() || m_path
.IsDirectory()));
3108 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3109 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_COMPRESSED
, WALKBEHAVIOUR_COMPRESSEDGRAPH
, m_iCompressedGraph
== 1);
3110 AppendMenuChecked(popup
, IDS_WALKBEHAVIOUR_LABELEDCOMMITS
, WALKBEHAVIOUR_LABELEDCOMMITS
, m_iCompressedGraph
== 2);
3114 GetDlgItem(IDC_WALKBEHAVIOUR
)->GetWindowRect(&rect
);
3115 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, rect
.left
, rect
.top
, this, 0);
3118 case WALKBEHAVIOUR_FIRSTPARENT
:
3119 m_bFirstParent
= !m_bFirstParent
;
3120 OnBnClickedFirstParent();
3122 case WALKBEHAVIOUR_NOMERGES
:
3123 m_bNoMerges
= !m_bNoMerges
;
3124 OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges
3126 case WALKBEHAVIOUR_FOLLOWRENAMES
:
3127 m_bFollowRenames
= !m_bFollowRenames
;
3128 OnBnClickedFollowRenames();
3130 case WALKBEHAVIOUR_COMPRESSEDGRAPH
:
3131 m_iCompressedGraph
= (m_iCompressedGraph
== 1 ? 0 : 1);
3132 OnBnClickedCompressedGraph();
3134 case WALKBEHAVIOUR_LABELEDCOMMITS
:
3135 m_iCompressedGraph
= (m_iCompressedGraph
== 2 ? 0 : 2);
3136 OnBnClickedCompressedGraph();
3141 m_bWalkBehavior
= (m_bFirstParent
|| m_bNoMerges
|| m_bFollowRenames
|| m_iCompressedGraph
);
3146 #define VIEW_HIDEPATHS 1
3147 #define VIEW_GRAYPATHS 2
3148 #define VIEW_SHOWTAGS 3
3149 #define VIEW_SHOWLOCALBRANCHES 4
3150 #define VIEW_SHOWREMOTEBRANCHES 5
3151 #define VIEW_SHOWGRAVATAR 6
3152 #define VIEW_SHOWPATCH 7
3154 void CLogDlg::OnBnClickedView()
3157 if (popup
.CreatePopupMenu())
3159 AppendMenuChecked(popup
, IDS_SHOWFILES_HIDEPATHS
, VIEW_HIDEPATHS
, m_iHidePaths
== 1);
3160 AppendMenuChecked(popup
, IDS_SHOWFILES_GRAYPATHS
, VIEW_GRAYPATHS
, m_iHidePaths
== 2);
3161 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3162 CMenu showLabelsMenu
;
3163 if (showLabelsMenu
.CreatePopupMenu())
3165 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWTAGLABELS
, VIEW_SHOWTAGS
, m_bShowTags
);
3166 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWLOCALBRANCHLABELS
, VIEW_SHOWLOCALBRANCHES
, m_bShowLocalBranches
);
3167 AppendMenuChecked(showLabelsMenu
, IDS_VIEW_SHOWREMOTEBRANCHLABELS
, VIEW_SHOWREMOTEBRANCHES
, m_bShowRemoteBranches
);
3168 popup
.AppendMenu(MF_STRING
| MF_POPUP
, (UINT_PTR
)showLabelsMenu
.m_hMenu
, (CString
)MAKEINTRESOURCE(IDS_VIEW_LABELS
));
3170 popup
.AppendMenu(MF_SEPARATOR
, NULL
);
3171 AppendMenuChecked(popup
, IDS_VIEW_SHOWGRAVATAR
, VIEW_SHOWGRAVATAR
, m_bShowGravatar
);
3172 AppendMenuChecked(popup
, IDS_MENU_VIEWPATCH
, VIEW_SHOWPATCH
, IsWindow(this->m_patchViewdlg
.m_hWnd
));
3176 GetDlgItem(IDC_VIEW
)->GetWindowRect(&rect
);
3177 int selection
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, rect
.left
, rect
.top
, this, 0);
3180 case VIEW_HIDEPATHS
:
3181 if (m_iHidePaths
== 1)
3185 OnBnClickedHidepaths();
3187 case VIEW_GRAYPATHS
:
3188 if (m_iHidePaths
== 2)
3192 OnBnClickedHidepaths();
3195 m_bShowTags
= !m_bShowTags
;
3196 HandleShowLabels(m_bShowTags
, LOGLIST_SHOWTAGS
);
3198 case VIEW_SHOWLOCALBRANCHES
:
3199 m_bShowLocalBranches
= !m_bShowLocalBranches
;
3200 HandleShowLabels(m_bShowLocalBranches
, LOGLIST_SHOWLOCALBRANCHES
);
3202 case VIEW_SHOWREMOTEBRANCHES
:
3203 m_bShowRemoteBranches
= !m_bShowRemoteBranches
;
3204 HandleShowLabels(m_bShowRemoteBranches
, LOGLIST_SHOWREMOTEBRANCHES
);
3206 case VIEW_SHOWGRAVATAR
:
3208 m_bShowGravatar
= !m_bShowGravatar
;
3212 POSITION pos
= m_LogList
.GetFirstSelectedItemPosition();
3215 int selIndex
= m_LogList
.GetNextSelectedItem(pos
);
3216 int moreSel
= m_LogList
.GetNextSelectedItem(pos
);
3219 GitRev
* pLogEntry
= reinterpret_cast<GitRev
*>(m_LogList
.m_arShownList
.SafeGetAt(selIndex
));
3221 email
= pLogEntry
->GetAuthorEmail();
3224 m_gravatar
.LoadGravatar(email
);
3227 case VIEW_SHOWPATCH
:
3236 void CLogDlg::OnBnClickedFirstParent()
3238 if(this->m_bFirstParent
)
3239 m_LogList
.m_ShowMask
|=CGit::LOG_INFO_FIRST_PARENT
;
3241 m_LogList
.m_ShowMask
&=~CGit::LOG_INFO_FIRST_PARENT
;
3244 m_LogList
.m_ShowMask
|= CGit::LOG_INFO_NO_MERGE
;
3246 m_LogList
.m_ShowMask
&= ~CGit::LOG_INFO_NO_MERGE
;
3250 FillLogMessageCtrl(false);
3254 void CLogDlg::OnBnClickShowWholeProject()
3258 if(this->m_bWholeProject
)
3260 m_LogList
.m_Path
.Reset();
3264 m_LogList
.m_Path
=m_path
;
3266 m_regShowWholeProject
= m_bWholeProject
;
3272 FillLogMessageCtrl(false);
3276 LRESULT
CLogDlg::OnRefLogChanged(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
3282 LRESULT
CLogDlg::OnTaskbarBtnCreated(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
3284 m_pTaskbarList
.Release();
3285 m_pTaskbarList
.CoCreateInstance(CLSID_TaskbarList
);
3286 SetUUIDOverlayIcon(m_hWnd
);
3290 LRESULT
CLogDlg::OnRefreshSelection(WPARAM
/*wParam*/, LPARAM
/*lParam*/)
3292 // it's enough to deselect, then select again one item of the whole selection
3293 int selMark
= m_LogList
.GetSelectionMark();
3296 m_LogList
.SetSelectionMark(selMark
);
3297 m_LogList
.SetItemState(selMark
, 0, LVIS_SELECTED
);
3298 m_LogList
.SetItemState(selMark
, LVIS_SELECTED
, LVIS_SELECTED
);